X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=kll.py;h=401d22e1f5b0de76b39812d3749a1d8538c4ccc6;hb=3f0149b7213fdcf28f94291ab5bcab2bed82ff91;hp=7844b8266a0d1b33e12b1aedef644e52197afa5b;hpb=bbf2c3ffaf4d579a5865c36c986720202d11f04a;p=kiibohd-kll.git

diff --git a/kll.py b/kll.py
index 7844b82..401d22e 100755
--- a/kll.py
+++ b/kll.py
@@ -93,9 +93,15 @@ def processCommandLineArgs():
 	pArgs.add_argument( '-t', '--template', type=str, default="templates/kiibohdKeymap.h",
 		help="Specify template used to generate the keymap.\n"
 		"Default: templates/kiibohdKeymap.h" )
-	pArgs.add_argument( '-o', '--output', type=str, default="templateKeymap.h",
+	pArgs.add_argument( '--defines-template', type=str, default="templates/kiibohdDefs.h",
+		help="Specify template used to generate kll_defs.h.\n"
+		"Default: templates/kiibohdDefs.h" )
+	pArgs.add_argument( '-o', '--output', type=str, default="generatedKeymap.h",
 		help="Specify output file. Writes to current working directory by default.\n"
 		"Default: generatedKeymap.h" )
+	pArgs.add_argument( '--defines-output', type=str, default="kll_defs.h",
+		help="Specify output path for kll_defs.h. Writes to current working directory by default.\n"
+		"Default: kll_defs.h" )
 	pArgs.add_argument( '-h', '--help', action="help",
 		help="This message." )
 
@@ -107,7 +113,7 @@ def processCommandLineArgs():
 	defaultFiles = args.default
 	partialFileSets = args.partial
 	if defaultFiles is None:
-		partialFileSets = []
+		defaultFiles = []
 	if partialFileSets is None:
 		partialFileSets = [[]]
 
@@ -122,7 +128,7 @@ def processCommandLineArgs():
 		for filename in partial:
 			checkFileExists( filename )
 
-	return (baseFiles, defaultFiles, partialFileSets, args.backend, args.template, args.output)
+	return (baseFiles, defaultFiles, partialFileSets, args.backend, args.template, args.defines_template, args.output, args.defines_output)
 
 
 
@@ -165,7 +171,7 @@ def tokenize( string ):
 
  ## Map Arrays
 macros_map        = Macros()
-variable_dict     = dict()
+variables_dict    = Variables()
 capabilities_dict = Capabilities()
 
 
@@ -255,6 +261,9 @@ def make_seqString( token ):
 def make_string( token ):
 	return token[1:-1]
 
+def make_unseqString( token ):
+	return token[1:-1]
+
 def make_number( token ):
 	return int( token, 0 )
 
@@ -321,6 +330,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 ):
@@ -363,7 +387,6 @@ def optionExpansion( sequences ):
 				curLeafList[ leaf ] = 0
 				if leaf + 1 < len( curLeafList ):
 					curLeafList[ leaf + 1 ] += 1
-				break
 
 	return expandedSequences
 
@@ -426,31 +449,36 @@ def eval_variable( name, content ):
 	for item in content:
 		assigned_content += str( item )
 
-	variable_dict[ name ] = assigned_content
+	variables_dict.assignVariable( name, assigned_content )
 
 def eval_capability( name, function, args ):
 	capabilities_dict[ name ] = [ function, args ]
 
+def eval_define( name, cdefine_name ):
+	variables_dict.defines[ name ] = cdefine_name
+
 map_scanCode   = unarg( eval_scanCode )
 map_usbCode    = unarg( eval_usbCode )
 
 set_variable   = unarg( eval_variable )
 set_capability = unarg( eval_capability )
+set_define     = unarg( eval_define )
 
 
  ## Sub Rules
 
-usbCode   = tokenType('USBCode') >> make_usbCode
-scanCode  = tokenType('ScanCode') >> make_scanCode
-name      = tokenType('Name')
-number    = tokenType('Number') >> make_number
-comma     = tokenType('Comma')
-dash      = tokenType('Dash')
-plus      = tokenType('Plus')
-content   = tokenType('VariableContents')
-string    = tokenType('String') >> make_string
-unString  = tokenType('String') # When the double quotes are still needed for internal processing
-seqString = tokenType('SequenceString') >> make_seqString
+usbCode     = tokenType('USBCode') >> make_usbCode
+scanCode    = tokenType('ScanCode') >> make_scanCode
+name        = tokenType('Name')
+number      = tokenType('Number') >> make_number
+comma       = tokenType('Comma')
+dash        = tokenType('Dash')
+plus        = tokenType('Plus')
+content     = tokenType('VariableContents')
+string      = tokenType('String') >> make_string
+unString    = tokenType('String') # When the double quotes are still needed for internal processing
+seqString   = tokenType('SequenceString') >> make_seqString
+unseqString = tokenType('SequenceString') >> make_unseqString # For use with variables
 
   # Code variants
 code_end = tokenType('CodeEnd')
@@ -478,7 +506,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
 
@@ -491,13 +519,16 @@ resultCode_outerList     = capFunc_sequence >> optionExpansion >> usbCodeToCapab
  ## Main Rules
 
 #| <variable> = <variable contents>;
-variable_contents   = name | content | string | number | comma | dash
+variable_contents   = name | content | string | number | comma | dash | unseqString
 variable_expression = name + skip( operator('=') ) + oneplus( variable_contents ) + skip( eol ) >> set_variable
 
 #| <capability name> => <c function>;
 capability_arguments  = name + skip( operator(':') ) + number + skip( maybe( comma ) )
 capability_expression = name + skip( operator('=>') ) + name + skip( parenthesis('(') ) + many( capability_arguments ) + skip( parenthesis(')') ) + skip( eol ) >> set_capability
 
+#| <define name> => <c define>;
+define_expression = name + skip( operator('=>') ) + name + skip( eol ) >> set_define
+
 #| <trigger> : <result>;
 operatorTriggerResult = operator(':') | operator(':+') | operator(':-')
 scanCode_expression   = triggerCode_outerList + operatorTriggerResult + resultCode_outerList + skip( eol ) >> map_scanCode
@@ -507,7 +538,7 @@ def parse( tokenSequence ):
 	"""Sequence(Token) -> object"""
 
 	# Top-level Parser
-	expression = scanCode_expression | usbCode_expression | variable_expression | capability_expression
+	expression = scanCode_expression | usbCode_expression | variable_expression | capability_expression | define_expression
 
 	kll_text = many( expression )
 	kll_file = maybe( kll_text ) + skip( finished )
@@ -521,38 +552,47 @@ def processKLLFile( filename ):
 		data = file.read()
 		tokenSequence = tokenize( data )
 		#print ( pformat( tokenSequence ) ) # Display tokenization
-		tree = parse( tokenSequence )
-
-
+		try:
+			tree = parse( tokenSequence )
+		except NoParseError as e:
+			print("Error parsing %s. %s" % (filename, e.msg), file=sys.stderr)
+			sys.exit(1)
 
 ### Main Entry Point ###
 
 if __name__ == '__main__':
-	(baseFiles, defaultFiles, partialFileSets, backend_name, template, output) = processCommandLineArgs()
+	(baseFiles, defaultFiles, partialFileSets, backend_name, template, defines_template, output, defines_output) = processCommandLineArgs()
 
 	# Load backend module
 	global backend
 	backend_import = importlib.import_module( "backends.{0}".format( backend_name ) )
-	backend = backend_import.Backend( template )
+	backend = backend_import.Backend( template, defines_template )
 
 	# Process base layout files
 	for filename in baseFiles:
+		variables_dict.setCurrentFile( filename )
 		processKLLFile( filename )
 	macros_map.completeBaseLayout() # Indicates to macros_map that the base layout is complete
+	variables_dict.baseLayoutFinished()
 
 	# Default combined layer
 	for filename in defaultFiles:
+		variables_dict.setCurrentFile( filename )
 		processKLLFile( filename )
-	# Apply assignment cache, see 5.1.2 USB Codes for why this is necessary
-	macros_map.replayCachedAssignments()
+		# 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()
+		variables_dict.incrementLayer() # DefaultLayer is layer 0
+
 		# Iterate and process each of the file in the layer
 		for filename in partial:
+			variables_dict.setCurrentFile( filename )
 			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
@@ -562,10 +602,10 @@ if __name__ == '__main__':
 	macros_map.generate()
 
 	# Process needed templating variables using backend
-	backend.process( capabilities_dict, macros_map )
+	backend.process( capabilities_dict, macros_map, variables_dict )
 
 	# Generate output file using template and backend
-	backend.generate( output )
+	backend.generate( output, defines_output )
 
 	# Successful Execution
 	sys.exit( 0 )