X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=kll_lib%2Fcontainers.py;h=2436c7ea930356fd8c00310fa3a938d9e96b9a5e;hb=f3451f619c96788ec8998fc111af0b4c8189d8cf;hp=b96cc32d6577845e41eee80704ac7a61347a8480;hpb=59a4b27de52b82bf7991ea3cbeed786f38fce1ac;p=kiibohd-kll.git

diff --git a/kll_lib/containers.py b/kll_lib/containers.py
index b96cc32..2436c7e 100644
--- a/kll_lib/containers.py
+++ b/kll_lib/containers.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 # KLL Compiler Containers
 #
-# Copyright (C) 2014 by Jacob Alexander
+# Copyright (C) 2014-2015 by Jacob Alexander
 #
 # This file is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -146,7 +146,8 @@ class Macros:
 		self.macros[ self.layer ][ trigger ] = [ result ]
 
 		# Mark layer scan code, so it won't be removed later
-		if not self.baseLayout is None:
+		# Also check to see if it hasn't already been removed before
+		if not self.baseLayout is None and trigger in self.layerLayoutMarkers[ self.layer ]:
 			del self.layerLayoutMarkers[ self.layer ][ trigger ]
 
 	# Return a list of ScanCode triggers with the given USB Code trigger
@@ -158,6 +159,16 @@ class Macros:
 			if usbCode in self.macros[ self.layer ][ macro ]:
 				scanCodeList.append( macro )
 
+		if len(scanCodeList) == 0:
+			if len(usbCode) > 1 or len(usbCode[0]) > 1:
+				for combo in usbCode:
+					comboCodes = list()
+					for key in combo:
+						scanCode = self.lookupUSBCodes(((key,),))
+						comboCodes.append(scanCode[0][0][0])
+					scanCodeList.append(tuple(code for code in comboCodes))
+				scanCodeList = [tuple(scanCodeList)]
+
 		return scanCodeList
 
 	# Cache USBCode Assignment
@@ -276,19 +287,69 @@ class Variables:
 	# Container for variables
 	# Stores three sets of variables, the overall combined set, per layer, and per file
 	def __init__( self ):
-		pass
+		# Dictionaries of variables
+		self.baseLayout       = dict()
+		self.fileVariables    = dict()
+		self.layerVariables   = [ dict() ]
+		self.overallVariables = dict()
+		self.defines          = dict()
+
+		self.currentFile = ""
+		self.currentLayer = 0
+		self.baseLayoutEnabled = True
 
-	def baseLayerFinished( self ):
-		pass
+	def baseLayoutFinished( self ):
+		self.baseLayoutEnabled = False
 
 	def setCurrentFile( self, name ):
 		# Store using filename and current layer
-		pass
+		self.currentFile = name
+		self.fileVariables[ name ] = dict()
+
+		# If still processing BaseLayout
+		if self.baseLayoutEnabled:
+			if '*LayerFiles' in self.baseLayout.keys():
+				self.baseLayout['*LayerFiles'] += [ name ]
+			else:
+				self.baseLayout['*LayerFiles'] = [ name ]
+		# Set for the current layer
+		else:
+			if '*LayerFiles' in self.layerVariables[ self.currentLayer ].keys():
+				self.layerVariables[ self.currentLayer ]['*LayerFiles'] += [ name ]
+			else:
+				self.layerVariables[ self.currentLayer ]['*LayerFiles'] = [ name ]
 
-	def setCurrentLayer( self, layer ):
+	def incrementLayer( self ):
 		# Store using layer index
-		pass
+		self.currentLayer += 1
+		self.layerVariables.append( dict() )
 
 	def assignVariable( self, key, value ):
-		pass
+		# Overall set of variables
+		self.overallVariables[ key ] = value
+
+		# The Name variable is a special accumulation case
+		if key == 'Name':
+			# BaseLayout still being processed
+			if self.baseLayoutEnabled:
+				if '*NameStack' in self.baseLayout.keys():
+					self.baseLayout['*NameStack'] += [ value ]
+				else:
+					self.baseLayout['*NameStack'] = [ value ]
+			# Layers
+			else:
+				if '*NameStack' in self.layerVariables[ self.currentLayer ].keys():
+					self.layerVariables[ self.currentLayer ]['*NameStack'] += [ value ]
+				else:
+					self.layerVariables[ self.currentLayer ]['*NameStack'] = [ value ]
+
+		# If still processing BaseLayout
+		if self.baseLayoutEnabled:
+			self.baseLayout[ key ] = value
+		# Set for the current layer
+		else:
+			self.layerVariables[ self.currentLayer ][ key ] = value
+
+		# File context variables
+		self.fileVariables[ self.currentFile ][ key ] = value