X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=kll.py;h=6d79b2e0295e75f077c0e57b401394a8c912bf80;hb=b4e4a13811f38b2ba6b36b0fd194c4dd399f61f8;hp=ca91da01cac80f109640cc415ec44efe2779d12d;hpb=a005ad49ad33f6f000066ee225474da31ac6d5d1;p=kiibohd-kll.git

diff --git a/kll.py b/kll.py
index ca91da0..6d79b2e 100755
--- a/kll.py
+++ b/kll.py
@@ -61,12 +61,17 @@ argparse._ = textFormatter_gettext
 
 ### Argument Parsing ###
 
+def checkFileExists( filename ):
+	if not os.path.isfile( filename ):
+		print ( "{0} {1} does not exist...".format( ERROR, filename ) )
+		sys.exit( 1 )
+
 def processCommandLineArgs():
 	# Setup argument processor
 	pArgs = argparse.ArgumentParser(
 	        usage="%(prog)s [options] <file1>...",
 	        description="Generates .h file state tables and pointer indices from KLL .kll files.",
-	        epilog="Example: {0} TODO".format( os.path.basename( sys.argv[0] ) ),
+	        epilog="Example: {0} mykeyboard.kll -d colemak.kll -p hhkbpro2.kll -p symbols.kll".format( os.path.basename( sys.argv[0] ) ),
 	        formatter_class=argparse.RawTextHelpFormatter,
 	        add_help=False,
 )
@@ -79,6 +84,8 @@ def processCommandLineArgs():
 	pArgs.add_argument( '-b', '--backend', type=str, default="kiibohd",
 		help="Specify target backend for the KLL compiler.\n"
 		"Default: kiibohd" )
+	pArgs.add_argument( '-d', '--default', type=str, nargs='+',
+		help="Specify .kll files to layer on top of the default map to create a combined map." )
 	pArgs.add_argument( '-p', '--partial', type=str, nargs='+', action='append',
 		help="Specify .kll files to generate partial map, multiple files per flag.\n"
 		"Each -p defines another partial map.\n"
@@ -96,24 +103,26 @@ def processCommandLineArgs():
 	args = pArgs.parse_args()
 
 	# Parameters
-	defaultFiles = args.files
+	baseFiles = args.files
+	defaultFiles = args.default
 	partialFileSets = args.partial
+	if defaultFiles is None:
+		defaultFiles = []
 	if partialFileSets is None:
 		partialFileSets = [[]]
 
 	# Check file existance
+	for filename in baseFiles:
+		checkFileExists( filename )
+
 	for filename in defaultFiles:
-		if not os.path.isfile( filename ):
-			print ( "{0} {1} does not exist...".format( ERROR, filename ) )
-			sys.exit( 1 )
+		checkFileExists( filename )
 
 	for partial in partialFileSets:
 		for filename in partial:
-			if not os.path.isfile( filename ):
-				print ( "{0} {1} does not exist...".format( ERROR, filename ) )
-				sys.exit( 1 )
+			checkFileExists( filename )
 
-	return (defaultFiles, partialFileSets, args.backend, args.template, args.output)
+	return (baseFiles, defaultFiles, partialFileSets, args.backend, args.template, args.output)
 
 
 
@@ -312,6 +321,21 @@ def oneLayerFlatten( items ):
 
 	return mainList
 
+  # Capability arguments may need to be expanded (e.g. 1 16 bit argument needs to be 2 8 bit arguments for the state machine)
+def capArgExpander( items ):
+	newArgs = []
+	# For each defined argument in the capability definition
+	for arg in range( 0, len( capabilities_dict[ items[0] ][1] ) ):
+		argLen = capabilities_dict[ items[0] ][1][ arg ][1]
+		num = items[1][ arg ]
+		byteForm = num.to_bytes( argLen, byteorder='little' ) # XXX Yes, little endian from how the uC structs work
+
+		# For each sub-argument, split into byte-sized chunks
+		for byte in range( 0, argLen ):
+			newArgs.append( byteForm[ byte ] )
+
+	return tuple( [ items[0], tuple( newArgs ) ] )
+
   # Expand ranges of values in the 3rd dimension of the list, to a list of 2nd lists
   # i.e. [ sequence, [ combo, [ range ] ] ] --> [ [ sequence, [ combo ] ], <option 2>, <option 3> ]
 def optionExpansion( sequences ):
@@ -397,9 +421,6 @@ def eval_scanCode( triggers, operator, results ):
 			elif operator == ":":
 				macros_map.replaceScanCode( trigger, result )
 
-	print ( triggers )
-	print ( results )
-
 def eval_usbCode( triggers, operator, results ):
 	# Convert to lists of lists of lists to tuples of tuples of tuples
 	# Tuples are non-mutable, and can be used has index items
@@ -411,20 +432,8 @@ def eval_usbCode( triggers, operator, results ):
 		scanCodes = macros_map.lookupUSBCodes( trigger )
 		for scanCode in scanCodes:
 			for result in results:
-				# Append Case
-				if operator == ":+":
-					macros_map.appendScanCode( scanCode, result )
-
-				# Remove Case
-				elif operator == ":-":
-					macros_map.removeScanCode( scanCode, result )
-
-				# Replace Case
-				elif operator == ":":
-					macros_map.replaceScanCode( scanCode, result )
-
-	#print ( triggers )
-	print ( results )
+				# Cache assignment until file finishes processing
+				macros_map.cacheAssignment( operator, scanCode, result )
 
 def eval_variable( name, content ):
 	# Content might be a concatenation of multiple data types, convert everything into a single string
@@ -484,7 +493,7 @@ usbCode_sequence    = oneplus( ( usbCode_combo | seqString ) + skip( maybe( comm
 
   # Capabilities
 capFunc_arguments = many( number + skip( maybe( comma ) ) ) >> listToTuple
-capFunc_elem      = name + skip( parenthesis('(') ) + capFunc_arguments + skip( parenthesis(')') ) >> listElem
+capFunc_elem      = name + skip( parenthesis('(') ) + capFunc_arguments + skip( parenthesis(')') ) >> capArgExpander >> listElem
 capFunc_combo     = oneplus( ( usbCode_expanded | usbCode_elem | capFunc_elem ) + skip( maybe( plus ) ) ) >> listElem
 capFunc_sequence  = oneplus( ( capFunc_combo | seqString ) + skip( maybe( comma ) ) ) >> oneLayerFlatten
 
@@ -506,8 +515,8 @@ capability_expression = name + skip( operator('=>') ) + name + skip( parenthesis
 
 #| <trigger> : <result>;
 operatorTriggerResult = operator(':') | operator(':+') | operator(':-')
-scanCode_expression = triggerCode_outerList + operatorTriggerResult + resultCode_outerList + skip( eol ) >> map_scanCode
-usbCode_expression  = triggerUSBCode_outerList + operatorTriggerResult + resultCode_outerList + skip( eol ) #>> map_usbCode
+scanCode_expression   = triggerCode_outerList + operatorTriggerResult + resultCode_outerList + skip( eol ) >> map_scanCode
+usbCode_expression    = triggerUSBCode_outerList + operatorTriggerResult + resultCode_outerList + skip( eol ) >> map_usbCode
 
 def parse( tokenSequence ):
 	"""Sequence(Token) -> object"""
@@ -522,31 +531,56 @@ def parse( tokenSequence ):
 
 
 
+def processKLLFile( filename ):
+	with open( filename ) as file:
+		data = file.read()
+		tokenSequence = tokenize( data )
+		#print ( pformat( tokenSequence ) ) # Display tokenization
+		tree = parse( tokenSequence )
+
+
+
 ### Main Entry Point ###
 
 if __name__ == '__main__':
-	(defaultFiles, partialFileSets, backend_name, template, output) = processCommandLineArgs()
+	(baseFiles, defaultFiles, partialFileSets, backend_name, template, output) = processCommandLineArgs()
 
 	# Load backend module
 	global backend
 	backend_import = importlib.import_module( "backends.{0}".format( backend_name ) )
 	backend = backend_import.Backend( template )
 
-	#TODO Move elsewhere
+	# Process base layout files
+	for filename in baseFiles:
+		processKLLFile( filename )
+	macros_map.completeBaseLayout() # Indicates to macros_map that the base layout is complete
+
+	# Default combined layer
 	for filename in defaultFiles:
-		with open( filename ) as file:
-			data = file.read()
-
-			tokenSequence = tokenize( data )
-			print ( pformat( tokenSequence ) ) # Display tokenization
-			tree = parse( tokenSequence )
-			#print ( tree )
-			print ( variable_dict )
-			print ( capabilities_dict )
-
-	# TODO Move
-	#macros_map.usbCodeToCapability( backend.usbCodeCapability() )
-	backend.process( capabilities_dict )
+		processKLLFile( filename )
+		# Apply assignment cache, see 5.1.2 USB Codes for why this is necessary
+		macros_map.replayCachedAssignments()
+
+	# Iterate through additional layers
+	for partial in partialFileSets:
+		# Increment layer for each -p option
+		macros_map.addLayer()
+		# Iterate and process each of the file in the layer
+		for filename in partial:
+			processKLLFile( filename )
+		# Apply assignment cache, see 5.1.2 USB Codes for why this is necessary
+		macros_map.replayCachedAssignments()
+		# Remove un-marked keys to complete the partial layer
+		macros_map.removeUnmarked()
+
+	# Do macro correlation and transformation
+	macros_map.generate()
+
+	# Process needed templating variables using backend
+	backend.process( capabilities_dict, macros_map )
+
+	# Generate output file using template and backend
+	backend.generate( output )
 
 	# Successful Execution
 	sys.exit( 0 )