Fixing kll permutation expansion bug.

diff --git a/examples/capabilitiesExample.kll b/examples/capabilitiesExample.kll
index b3902661ac21f54ccd94c9a6946fea647a8ebb4a..66b17b65cf8f75d6b9baf83b004fa6d68af9f7c7 100644 (file)
--- a/examples/capabilitiesExample.kll
+++ b/examples/capabilitiesExample.kll
@@ -6,4 +6,5 @@ KLL = 0.3;
 myCapability2 => myFunc2();
 myCapability3 => myFunc2( myArg1 : 2 );
 myCapability  => myFunc( myArg1 : 1, myArg2 : 4 );
+usbKeyOut   => Output_usbCodeSend_capability( usbCode : 1 );
 

diff --git a/examples/simple1.kll b/examples/simple1.kll
index 5b9136029eca00cd80d540e1fab41a1507d973e1..1ce1b4d8f53e66eefe1cbb0155c654cb7ffd80ea 100644 (file)
--- a/examples/simple1.kll
+++ b/examples/simple1.kll
@@ -5,6 +5,7 @@ KLL = 0.3;
 myCapability2 => myFunc2();
 myCapability3 => myFunc3( myArg1 : 2 );
 myCapability  => myFunc( myArg1 : 1, myArg2 : 4 );
+usbKeyOut   => Output_usbCodeSend_capability( usbCode : 1 );
 
 S0x3 : myCapability2();
 S0x4 : myCapability2() + myCapability3(0x5);

diff --git a/kll.py b/kll.py
index 76dc3b50da92e8564a2e9275d4c89bf47a17fe02..57fd37aa37ce39783f7ae4d442601782d009fbdf 100755 (executable)
--- a/kll.py
+++ b/kll.py
@@ -387,7 +387,6 @@ def optionExpansion( sequences ):
                                curLeafList[ leaf ] = 0
                                if leaf + 1 < len( curLeafList ):
                                        curLeafList[ leaf + 1 ] += 1
-                               break
 
        return expandedSequences