Refactor using a new Peggy operator

sparqling · Dec 9, 2024 · 85f3055 · 85f3055
1 parent 6be5ee6
commit 85f3055
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 38 deletions.
diff --git a/lib/parser.js b/lib/parser.js
diff --git a/lib/spang.pegjs b/lib/spang.pegjs
@@ -940,15 +940,9 @@ Verb = VarOrIri
 }
 
 // [79] ObjectList ::= Object ( ',' Object )*
-ObjectList = o:Object os:( WS* ',' WS* Object )*
+ObjectList = o:Object os:( WS* ',' WS* @Object )*
 {
-  let ret = [o];
-
-  os.forEach((oi) => {
-    ret.push(oi[3]);
-  });
-
-  return ret;
+  return [o, ...os];
 }
 
 // [80] Object ::= GraphNode
@@ -994,15 +988,9 @@ VerbPath = Path
 VerbSimple = Var
 
 // [86] ObjectListPath ::= ObjectPath ( ',' ObjectPath )*
-ObjectListPath = o:ObjectPath os:( WS* ',' WS* ObjectPath )*
+ObjectListPath = o:ObjectPath os:( WS* ',' WS* @ObjectPath )*
 {
-  let ret = [o];
-
-  os.forEach((oi) => {
-    ret.push(oi[3]);
-  });
-
-  return ret;
+  return [o, ...os];
 }
 
 // [87] ObjectPath ::= GraphNodePath