RFC 7159 compliance.

pegex-parser · Aug 31, 2014 · fcb51a3 · fcb51a3
1 parent f3bfae6
commit fcb51a3
Show file tree

Hide file tree

Showing 2 changed files with 49 additions and 70 deletions.
diff --git a/lib/Pegex/JSON/Data.pm b/lib/Pegex/JSON/Data.pm
@@ -4,8 +4,8 @@ extends 'Pegex::Tree';
 
 use boolean;
 
-sub got_map { +{map @$_, map @$_, @{(pop)}} }
-sub got_seq { [map @$_, @{(pop)}] }
+sub got_object { +{map @$_, map @$_, @{(pop)}} }
+sub got_array { [map @$_, @{(pop)}] }
 
 my %escapes = (
     '"' => '"',

diff --git a/lib/Pegex/JSON/Grammar.pm b/lib/Pegex/JSON/Grammar.pm
@@ -4,36 +4,55 @@ extends 'Pegex::Grammar';
 
 use constant file => '../json-pgx/json.pgx';
 
-sub make_tree {
+sub make_tree {   # Generated/Inlined by Pegex::Grammar (0.45)
   {
     '+grammar' => 'json',
     '+include' => 'pegex-atoms',
     '+toprule' => 'json',
     '+version' => '0.0.1',
-    'boolean' => {
-      '.any' => [
+    'array' => {
+      '.all' => [
         {
-          '.ref' => 'true'
+          '.rgx' => qr/\G\s*\[\s*/
         },
         {
-          '.ref' => 'false'
+          '+max' => 1,
+          '.all' => [
+            {
+              '.ref' => 'value'
+            },
+            {
+              '+min' => 0,
+              '-flat' => 1,
+              '.all' => [
+                {
+                  '.rgx' => qr/\G\s*,\s*/
+                },
+                {
+                  '.ref' => 'value'
+                }
+              ]
+            }
+          ]
+        },
+        {
+          '.rgx' => qr/\G\s*\]\s*/
         }
       ]
     },
     'false' => {
       '.rgx' => qr/\Gfalse/
     },
     'json' => {
-      '.any' => [
-        {
-          '.ref' => 'map'
-        },
-        {
-          '.ref' => 'seq'
-        }
-      ]
+      '.ref' => 'value'
+    },
+    'null' => {
+      '.rgx' => qr/\Gnull/
+    },
+    'number' => {
+      '.rgx' => qr/\G(\-?(?:0|[1-9][0-9]*)(?:\.[0-9]*)?(?:[eE][\-\+]?[0-9]+)?)/
     },
-    'map' => {
+    'object' => {
       '.all' => [
         {
           '.rgx' => qr/\G\s*\{\s*/
@@ -63,25 +82,6 @@ sub make_tree {
         }
       ]
     },
-    'node' => {
-      '.any' => [
-        {
-          '.ref' => 'map'
-        },
-        {
-          '.ref' => 'seq'
-        },
-        {
-          '.ref' => 'scalar'
-        }
-      ]
-    },
-    'null' => {
-      '.rgx' => qr/\Gnull/
-    },
-    'number' => {
-      '.rgx' => qr/\G(\-?(?:0|[1-9][0-9]*)(?:\.[0-9]*)?(?:[eE][\-\+]?[0-9]+)?)/
-    },
     'pair' => {
       '.all' => [
         {
@@ -91,11 +91,17 @@ sub make_tree {
           '.rgx' => qr/\G\s*:\s*/
         },
         {
-          '.ref' => 'node'
+          '.ref' => 'value'
         }
       ]
     },
-    'scalar' => {
+    'string' => {
+      '.rgx' => qr/\G"((?:\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})|[^"\x00-\x1f])*)"/
+    },
+    'true' => {
+      '.rgx' => qr/\Gtrue/
+    },
+    'value' => {
       '.any' => [
         {
           '.ref' => 'string'
@@ -104,48 +110,21 @@ sub make_tree {
           '.ref' => 'number'
         },
         {
-          '.ref' => 'boolean'
+          '.ref' => 'object'
         },
         {
-          '.ref' => 'null'
-        }
-      ]
-    },
-    'seq' => {
-      '.all' => [
+          '.ref' => 'array'
+        },
         {
-          '.rgx' => qr/\G\s*\[\s*/
+          '.ref' => 'true'
         },
         {
-          '+max' => 1,
-          '.all' => [
-            {
-              '.ref' => 'node'
-            },
-            {
-              '+min' => 0,
-              '-flat' => 1,
-              '.all' => [
-                {
-                  '.rgx' => qr/\G\s*,\s*/
-                },
-                {
-                  '.ref' => 'node'
-                }
-              ]
-            }
-          ]
+          '.ref' => 'false'
         },
         {
-          '.rgx' => qr/\G\s*\]\s*/
+          '.ref' => 'null'
         }
       ]
-    },
-    'string' => {
-      '.rgx' => qr/\G"((?:\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})|[^"\x00-\x1f])*)"/
-    },
-    'true' => {
-      '.rgx' => qr/\Gtrue/
     }
   }
 }