add patch for 8.0 from

  https://github.com/weltling/parle/pull/22

1 files changed, 63 insertions, 45 deletions

diff --git a/REFLECTION b/REFLECTION
index a69a0dd..0178b3c 100644
--- a/REFLECTION
+++ b/REFLECTION
@@ -1,7 +1,7 @@
 Extension [ <persistent> extension #119 parle version 0.8.1 ] {
 
   - Constants [1] {
-    Constant [ boolean Parle\INTERNAL_UTF32 ] {  }
+    Constant [ bool Parle\INTERNAL_UTF32 ] {  }
   }
 
   - Classes [10] {
@@ -29,9 +29,9 @@ Extension [ <persistent> extension #119 parle version 0.8.1 ] {
     Class [ <internal:parle> class Parle\Token ] {
 
       - Constants [3] {
-        Constant [ public integer EOI ] { 0 }
-        Constant [ public integer UNKNOWN ] { 65535 }
-        Constant [ public integer SKIP ] { 65534 }
+        Constant [ public int EOI ] { 0 }
+        Constant [ public int UNKNOWN ] { 65535 }
+        Constant [ public int SKIP ] { 65534 }
       }
 
       - Static properties [0] {
@@ -52,11 +52,11 @@ Extension [ <persistent> extension #119 parle version 0.8.1 ] {
     Class [ <internal:parle> class Parle\Lexer ] {
 
       - Constants [5] {
-        Constant [ public integer ICASE ] { 1 }
-        Constant [ public integer DOT_NOT_LF ] { 2 }
-        Constant [ public integer DOT_NOT_CRLF ] { 4 }
-        Constant [ public integer SKIP_WS ] { 8 }
-        Constant [ public integer MATCH_ZERO_LEN ] { 16 }
+        Constant [ public int ICASE ] { 1 }
+        Constant [ public int DOT_NOT_LF ] { 2 }
+        Constant [ public int DOT_NOT_CRLF ] { 4 }
+        Constant [ public int SKIP_WS ] { 8 }
+        Constant [ public int MATCH_ZERO_LEN ] { 16 }
       }
 
       - Static properties [0] {
@@ -75,6 +75,10 @@ Extension [ <persistent> extension #119 parle version 0.8.1 ] {
 
       - Methods [9] {
         Method [ <internal:parle> public method push ] {
+
+          - Parameters [1] {
+            Parameter #0 [ <optional> ...$args ]
+          }
         }
 
         Method [ <internal:parle> public method getToken ] {
@@ -106,11 +110,16 @@ Extension [ <persistent> extension #119 parle version 0.8.1 ] {
         Method [ <internal:parle> public method reset ] {
 
           - Parameters [1] {
-            Parameter #0 [ <required> integer $pos ]
+            Parameter #0 [ <required> int $pos ]
           }
         }
 
         Method [ <internal:parle> public method insertMacro ] {
+
+          - Parameters [2] {
+            Parameter #0 [ <required> string $name ]
+            Parameter #1 [ <required> string $reg ]
+          }
         }
 
         Method [ <internal:parle> public method dump ] {
@@ -122,7 +131,7 @@ Extension [ <persistent> extension #119 parle version 0.8.1 ] {
         Method [ <internal:parle> public method callout ] {
 
           - Parameters [2] {
-            Parameter #0 [ <required> integer $id ]
+            Parameter #0 [ <required> int $id ]
             Parameter #1 [ <required> $callback ]
           }
         }
@@ -132,11 +141,11 @@ Extension [ <persistent> extension #119 parle version 0.8.1 ] {
     Class [ <internal:parle> class Parle\RLexer ] {
 
       - Constants [5] {
-        Constant [ public integer ICASE ] { 1 }
-        Constant [ public integer DOT_NOT_LF ] { 2 }
-        Constant [ public integer DOT_NOT_CRLF ] { 4 }
-        Constant [ public integer SKIP_WS ] { 8 }
-        Constant [ public integer MATCH_ZERO_LEN ] { 16 }
+        Constant [ public int ICASE ] { 1 }
+        Constant [ public int DOT_NOT_LF ] { 2 }
+        Constant [ public int DOT_NOT_CRLF ] { 4 }
+        Constant [ public int SKIP_WS ] { 8 }
+        Constant [ public int MATCH_ZERO_LEN ] { 16 }
       }
 
       - Static properties [0] {
@@ -155,6 +164,10 @@ Extension [ <persistent> extension #119 parle version 0.8.1 ] {
 
       - Methods [10] {
         Method [ <internal:parle> public method push ] {
+
+          - Parameters [1] {
+            Parameter #0 [ <optional> ...$args ]
+          }
         }
 
         Method [ <internal:parle> public method getToken ] {
@@ -186,7 +199,7 @@ Extension [ <persistent> extension #119 parle version 0.8.1 ] {
         Method [ <internal:parle> public method reset ] {
 
           - Parameters [1] {
-            Parameter #0 [ <required> integer $pos ]
+            Parameter #0 [ <required> int $pos ]
           }
         }
 
@@ -195,10 +208,15 @@ Extension [ <persistent> extension #119 parle version 0.8.1 ] {
           - Parameters [1] {
             Parameter #0 [ <required> string $state ]
           }
-          - Return [ integer ]
+          - Return [ int ]
         }
 
         Method [ <internal:parle> public method insertMacro ] {
+
+          - Parameters [2] {
+            Parameter #0 [ <required> string $name ]
+            Parameter #1 [ <required> string $reg ]
+          }
         }
 
         Method [ <internal:parle> public method dump ] {
@@ -210,7 +228,7 @@ Extension [ <persistent> extension #119 parle version 0.8.1 ] {
         Method [ <internal:parle> public method callout ] {
 
           - Parameters [2] {
-            Parameter #0 [ <required> integer $id ]
+            Parameter #0 [ <required> int $id ]
             Parameter #1 [ <required> $callback ]
           }
         }
@@ -220,14 +238,14 @@ Extension [ <persistent> extension #119 parle version 0.8.1 ] {
     Class [ <internal:parle> class Parle\Parser ] {
 
       - Constants [8] {
-        Constant [ public integer ACTION_ERROR ] { 0 }
-        Constant [ public integer ACTION_SHIFT ] { 1 }
-        Constant [ public integer ACTION_REDUCE ] { 2 }
-        Constant [ public integer ACTION_GOTO ] { 3 }
-        Constant [ public integer ACTION_ACCEPT ] { 4 }
-        Constant [ public integer ERROR_SYNTAX ] { 0 }
-        Constant [ public integer ERROR_NON_ASSOCIATIVE ] { 1 }
-        Constant [ public integer ERROR_UNKNOWN_TOKEN ] { 2 }
+        Constant [ public int ACTION_ERROR ] { 0 }
+        Constant [ public int ACTION_SHIFT ] { 1 }
+        Constant [ public int ACTION_REDUCE ] { 2 }
+        Constant [ public int ACTION_GOTO ] { 3 }
+        Constant [ public int ACTION_ACCEPT ] { 4 }
+        Constant [ public int ERROR_SYNTAX ] { 0 }
+        Constant [ public int ERROR_NON_ASSOCIATIVE ] { 1 }
+        Constant [ public int ERROR_UNKNOWN_TOKEN ] { 2 }
       }
 
       - Static properties [0] {
@@ -289,7 +307,7 @@ Extension [ <persistent> extension #119 parle version 0.8.1 ] {
             Parameter #0 [ <required> string $name ]
             Parameter #1 [ <required> string $rule ]
           }
-          - Return [ integer ]
+          - Return [ int ]
         }
 
         Method [ <internal:parle> public method validate ] {
@@ -298,7 +316,7 @@ Extension [ <persistent> extension #119 parle version 0.8.1 ] {
             Parameter #0 [ <optional> string $data ]
             Parameter #1 [ <optional> Parle\Lexer $lexer ]
           }
-          - Return [ boolean ]
+          - Return [ bool ]
         }
 
         Method [ <internal:parle> public method tokenId ] {
@@ -306,13 +324,13 @@ Extension [ <persistent> extension #119 parle version 0.8.1 ] {
           - Parameters [1] {
             Parameter #0 [ <required> string $tok ]
           }
-          - Return [ integer ]
+          - Return [ int ]
         }
 
         Method [ <internal:parle> public method sigil ] {
 
           - Parameters [1] {
-            Parameter #0 [ <optional> integer $idx ]
+            Parameter #0 [ <optional> int $idx ]
           }
           - Return [ string ]
         }
@@ -354,7 +372,7 @@ Extension [ <persistent> extension #119 parle version 0.8.1 ] {
         Method [ <internal:parle> public method reset ] {
 
           - Parameters [1] {
-            Parameter #0 [ <required> integer $tok ]
+            Parameter #0 [ <required> int $tok ]
           }
         }
       }
@@ -363,14 +381,14 @@ Extension [ <persistent> extension #119 parle version 0.8.1 ] {
     Class [ <internal:parle> class Parle\RParser ] {
 
       - Constants [8] {
-        Constant [ public integer ACTION_ERROR ] { 0 }
-        Constant [ public integer ACTION_SHIFT ] { 1 }
-        Constant [ public integer ACTION_REDUCE ] { 2 }
-        Constant [ public integer ACTION_GOTO ] { 3 }
-        Constant [ public integer ACTION_ACCEPT ] { 4 }
-        Constant [ public integer ERROR_SYNTAX ] { 0 }
-        Constant [ public integer ERROR_NON_ASSOCIATIVE ] { 1 }
-        Constant [ public integer ERROR_UNKNOWN_TOKEN ] { 2 }
+        Constant [ public int ACTION_ERROR ] { 0 }
+        Constant [ public int ACTION_SHIFT ] { 1 }
+        Constant [ public int ACTION_REDUCE ] { 2 }
+        Constant [ public int ACTION_GOTO ] { 3 }
+        Constant [ public int ACTION_ACCEPT ] { 4 }
+        Constant [ public int ERROR_SYNTAX ] { 0 }
+        Constant [ public int ERROR_NON_ASSOCIATIVE ] { 1 }
+        Constant [ public int ERROR_UNKNOWN_TOKEN ] { 2 }
       }
 
       - Static properties [0] {
@@ -432,7 +450,7 @@ Extension [ <persistent> extension #119 parle version 0.8.1 ] {
             Parameter #0 [ <required> string $name ]
             Parameter #1 [ <required> string $rule ]
           }
-          - Return [ integer ]
+          - Return [ int ]
         }
 
         Method [ <internal:parle> public method validate ] {
@@ -441,7 +459,7 @@ Extension [ <persistent> extension #119 parle version 0.8.1 ] {
             Parameter #0 [ <optional> string $data ]
             Parameter #1 [ <optional> Parle\RLexer $lexer ]
           }
-          - Return [ boolean ]
+          - Return [ bool ]
         }
 
         Method [ <internal:parle> public method tokenId ] {
@@ -449,13 +467,13 @@ Extension [ <persistent> extension #119 parle version 0.8.1 ] {
           - Parameters [1] {
             Parameter #0 [ <required> string $tok ]
           }
-          - Return [ integer ]
+          - Return [ int ]
         }
 
         Method [ <internal:parle> public method sigil ] {
 
           - Parameters [1] {
-            Parameter #0 [ <optional> integer $idx ]
+            Parameter #0 [ <optional> int $idx ]
           }
           - Return [ string ]
         }
@@ -497,7 +515,7 @@ Extension [ <persistent> extension #119 parle version 0.8.1 ] {
         Method [ <internal:parle> public method reset ] {
 
           - Parameters [1] {
-            Parameter #0 [ <required> integer $tok ]
+            Parameter #0 [ <required> int $tok ]
           }
         }
       }