cleanup

oracle · Mar 27, 2020 · 8b2c127 · 8b2c127
1 parent 227dbcc
commit 8b2c127
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 44 deletions.
diff --git a/pgql-spoofax/syntax/Experimental.sdf3 b/pgql-spoofax/syntax/Experimental.sdf3
diff --git a/pgql-spoofax/syntax/GraphPattern.sdf3 b/pgql-spoofax/syntax/GraphPattern.sdf3
@@ -15,12 +15,8 @@ context-free syntax
 
   Pgql11FromClause.Pgql11FromClause = <FROM <GraphName>> {case-insensitive}
 
-  MatchWhereClauses.MatchWhereClauses = <MATCH <{PathPattern ","}+> <WhereClause?>> {case-insensitive}
-
   LocalGraphName.GraphName = Identifier
 
-  GraphPattern.GraphPattern = <<{PathPattern ","}+>>
-
 context-free syntax
 
   PathPattern.PathPattern = <<Vertex> <EdgeVertex+>>

diff --git a/pgql-spoofax/syntax/Legacy.sdf3 b/pgql-spoofax/syntax/Legacy.sdf3
@@ -13,6 +13,22 @@ template options
 
   keyword -/- [a-zA-Z0-9]
 
+context-free syntax // PGQL 1.1/1.2
+
+  Query.Pgql11Query =
+    <
+      <{CommonPathExpression "\n"}*>
+      <SelectOrModify>
+      <Pgql11FromClause?>
+      <MatchWhereClauses>
+      <GroupByClause?>
+      <HavingClause?>
+      <OrderByClause?>
+      <LimitOffsetClauses?>
+    >
+
+  MatchWhereClauses.MatchWhereClauses = <MATCH <{PathPattern ","}+> <WhereClause?>> {case-insensitive}
+
 context-free syntax // pgql-lang.sdf3 for PGQL 1.0
 
   Legacy10Query.Pgql10Query =

diff --git a/pgql-spoofax/syntax/pgql-lang.sdf3 b/pgql-spoofax/syntax/pgql-lang.sdf3
@@ -9,7 +9,6 @@ imports
   SolutionModifiers
   Legacy
   Expressions
-  Experimental
   Modify
   DDL
 
@@ -27,18 +26,27 @@ context-free syntax
 
   Statement = Query
 
-  Query.Pgql11Query =
+  ExperimentalQuery.Query =
     <
       <{CommonPathExpression "\n"}*>
       <SelectOrModify>
-      <Pgql11FromClause?>
-      <MatchWhereClauses>
+      <FromWhereClauses?>
       <GroupByClause?>
       <HavingClause?>
       <OrderByClause?>
       <LimitOffsetClauses?>
     >
 
+  FromWhereClauses.FromWhereClauses = <FROM <{TableExpression ","}+> <WhereClause?>> {case-insensitive}
+
+  TableExpression = GraphMatch
+
+  GraphMatch.GraphMatch = <<MatchKeyword?> <PathPattern> <OnClause?>>
+
+  MatchKeyword.MatchKeyword = <MATCH> {case-insensitive}
+
+  OnClause.OnClause = <ON <GraphName>> {case-insensitive}
+
   SelectOrModify = SelectClause
   SelectOrModify = ModifyClause