X-Git-Url: https://git.donarmstrong.com/?p=kiibohd-kll.git;a=blobdiff_plain;f=kll.py;h=c4386e0bf7cb34bbadfb38da0e7d52dea37602e0;hp=07a822cd149ad876283ce94b3dda7389ca9ff0f8;hb=26437c35ad12ac90a94657b3bb5a1ed1b8f5e0db;hpb=f1bad4de4b82d4ebbda78184d9c05edaf999e4c3

diff --git a/kll.py b/kll.py
index 07a822c..c4386e0 100755
--- a/kll.py
+++ b/kll.py
@@ -147,7 +147,7 @@ def tokenize( string ):
 		( 'ScanCode',         ( r'S((0x[0-9a-fA-F]+)|([0-9]+))', ) ),
 		( 'ScanCodeStart',    ( r'S\[', ) ),
 		( 'CodeEnd',          ( r'\]', ) ),
-		( 'String',           ( r'"[^"]*"', VERBOSE ) ),
+		( 'String',           ( r'"[^"]*"', ) ),
 		( 'SequenceString',   ( r"'[^']*'", ) ),
 		( 'Operator',         ( r'=>|:\+|:-|::|:|=', ) ),
 		( 'Comma',            ( r',', ) ),
@@ -268,16 +268,17 @@ def make_seqString( token ):
 		( "ABCDEFGHIJKLMNOPQRSTUVWXYZ", 0x20 ),
 		( "+",       0x12 ),
 		( "&(",      0x11 ),
-		( "!#$%<>",  0x10 ),
+		( "!#$%",    0x10 ),
 		( "*",       0x0E ),
 		( ")",       0x07 ),
 		( '"',       0x05 ),
 		( ":",       0x01 ),
-		( "^",      -0x10 ),
-		( "_",      -0x18 ),
-		( "{}|~",   -0x1E ),
-		( "@",      -0x32 ),
-		( "?",      -0x38 ),
+		( "@",      -0x0E ),
+		( "<>?",    -0x10 ),
+		( "~",      -0x1E ),
+		( "{}|",    -0x20 ),
+		( "^",      -0x28 ),
+		( "_",      -0x32 ),
 	)
 
 	listOfLists = []