Merge pull request #127 from objectionary/126-fix-grammar

126 fix grammar
objectionary · Feb 16, 2024 · 957e699 · 957e699 · 0pdd · Feb 16, 2024
2 parents 776fa72 + 6e4223f
commit 957e699
Show file tree

Hide file tree

Showing 10 changed files with 155 additions and 151 deletions.
diff --git a/eo b/eo
diff --git a/eo-phi-normalizer/grammar/EO/Phi/Syntax.cf b/eo-phi-normalizer/grammar/EO/Phi/Syntax.cf
@@ -11,7 +11,7 @@ token AlphaIndex ({"α0"} | {"α"} (digit - ["0"]) (digit)* ) ;
 token MetaId {"!"} (char - [" \r\n\t,.|':;!-?][}{)(⟧⟦"])* ;
 token MetaFunctionName {"@"} (char - [" \r\n\t,.|':;!-?][}{)(⟧⟦"])* ;
 
-Program. Program ::= "{" [Binding] "}" ;
+Program. Program ::= "{" "⟦" [Binding] "⟧" "}" ;
 
 Formation.      Object ::= "⟦" [Binding] "⟧" ;
 Application.    Object ::= Object "(" [Binding] ")" ;

diff --git a/eo-phi-normalizer/src/Language/EO/Phi/Syntax/Doc.txt b/eo-phi-normalizer/src/Language/EO/Phi/Syntax/Doc.txt
diff --git a/eo-phi-normalizer/src/Language/EO/Phi/Syntax/Lex.x b/eo-phi-normalizer/src/Language/EO/Phi/Syntax/Lex.x
diff --git a/eo-phi-normalizer/src/Language/EO/Phi/Syntax/Par.y b/eo-phi-normalizer/src/Language/EO/Phi/Syntax/Par.y
diff --git a/eo-phi-normalizer/src/Language/EO/Phi/Syntax/Print.hs b/eo-phi-normalizer/src/Language/EO/Phi/Syntax/Print.hs
diff --git a/eo-phi-normalizer/test/eo/phi/from-eo/as-phi.yaml b/eo-phi-normalizer/test/eo/phi/from-eo/as-phi.yaml
@@ -2,8 +2,8 @@ title: Processing terms generated from EO
 tests:
   - name: "A program that prints itself"
     input: |
-      {org ↦ ⟦eolang ↦ ⟦prints-itself ↦ ⟦φ ↦ Φ.org.eolang.as-phi(α0 ↦ ξ).length.gt(α0 ↦ Φ.org.eolang.int(α0 ↦ Φ.org.eolang.bytes(Δ ⤍ 00-00-00-00-00-00-00-00)))⟧, prints-itself-to-console ↦ ⟦x ↦ Φ.org.eolang.int(α0 ↦ Φ.org.eolang.bytes(Δ ⤍ 00-00-00-00-00-00-00-2A)), φ ↦ Φ.org.eolang.io.stdout(α0 ↦ Φ.org.eolang.as-phi(α0 ↦ ξ))⟧, λ ⤍ Package⟧, λ ⤍ Package⟧}
+      {⟦org ↦ ⟦eolang ↦ ⟦prints-itself ↦ ⟦φ ↦ Φ.org.eolang.as-phi(α0 ↦ ξ).length.gt(α0 ↦ Φ.org.eolang.int(α0 ↦ Φ.org.eolang.bytes(Δ ⤍ 00-00-00-00-00-00-00-00)))⟧, prints-itself-to-console ↦ ⟦x ↦ Φ.org.eolang.int(α0 ↦ Φ.org.eolang.bytes(Δ ⤍ 00-00-00-00-00-00-00-2A)), φ ↦ Φ.org.eolang.io.stdout(α0 ↦ Φ.org.eolang.as-phi(α0 ↦ ξ))⟧, λ ⤍ Package⟧, λ ⤍ Package⟧⟧}
     normalized: |
-      { ν ↦ ⟦ Δ ⤍ 04- ⟧, org ↦ ⟦ ν ↦ ⟦ Δ ⤍ 03- ⟧, eolang ↦ ⟦ ν ↦ ⟦ Δ ⤍ 02- ⟧, prints-itself ↦ ⟦ ν ↦ ⟦ Δ ⤍ 00- ⟧, φ ↦ Φ.org.eolang.as-phi (α0 ↦ ξ).length.gt (α0 ↦ Φ.org.eolang.int (α0 ↦ Φ.org.eolang.bytes (Δ ⤍ 00-00-00-00-00-00-00-00))) ⟧, prints-itself-to-console ↦ ⟦ ν ↦ ⟦ Δ ⤍ 01- ⟧, x ↦ Φ.org.eolang.int (α0 ↦ Φ.org.eolang.bytes (Δ ⤍ 00-00-00-00-00-00-00-2A)), φ ↦ Φ.org.eolang.io.stdout (α0 ↦ Φ.org.eolang.as-phi (α0 ↦ ξ)) ⟧, λ ⤍ Package ⟧, λ ⤍ Package ⟧ }
+      { ⟦ ν ↦ ⟦ Δ ⤍ 04- ⟧, org ↦ ⟦ ν ↦ ⟦ Δ ⤍ 03- ⟧, eolang ↦ ⟦ ν ↦ ⟦ Δ ⤍ 02- ⟧, prints-itself ↦ ⟦ ν ↦ ⟦ Δ ⤍ 00- ⟧, φ ↦ Φ.org.eolang.as-phi (α0 ↦ ξ).length.gt (α0 ↦ Φ.org.eolang.int (α0 ↦ Φ.org.eolang.bytes (Δ ⤍ 00-00-00-00-00-00-00-00))) ⟧, prints-itself-to-console ↦ ⟦ ν ↦ ⟦ Δ ⤍ 01- ⟧, x ↦ Φ.org.eolang.int (α0 ↦ Φ.org.eolang.bytes (Δ ⤍ 00-00-00-00-00-00-00-2A)), φ ↦ Φ.org.eolang.io.stdout (α0 ↦ Φ.org.eolang.as-phi (α0 ↦ ξ)) ⟧, λ ⤍ Package ⟧, λ ⤍ Package ⟧ ⟧ }
     prettified: |
-      { org ↦ ⟦ eolang ↦ ⟦ prints-itself ↦ ⟦ φ ↦ Φ.org.eolang.as-phi (α0 ↦ ξ).length.gt (α0 ↦ Φ.org.eolang.int (α0 ↦ Φ.org.eolang.bytes (Δ ⤍ 00-00-00-00-00-00-00-00))) ⟧, prints-itself-to-console ↦ ⟦ x ↦ Φ.org.eolang.int (α0 ↦ Φ.org.eolang.bytes (Δ ⤍ 00-00-00-00-00-00-00-2A)), φ ↦ Φ.org.eolang.io.stdout (α0 ↦ Φ.org.eolang.as-phi (α0 ↦ ξ)) ⟧, λ ⤍ Package ⟧, λ ⤍ Package ⟧ }
+      { ⟦ org ↦ ⟦ eolang ↦ ⟦ prints-itself ↦ ⟦ φ ↦ Φ.org.eolang.as-phi (α0 ↦ ξ).length.gt (α0 ↦ Φ.org.eolang.int (α0 ↦ Φ.org.eolang.bytes (Δ ⤍ 00-00-00-00-00-00-00-00))) ⟧, prints-itself-to-console ↦ ⟦ x ↦ Φ.org.eolang.int (α0 ↦ Φ.org.eolang.bytes (Δ ⤍ 00-00-00-00-00-00-00-2A)), φ ↦ Φ.org.eolang.io.stdout (α0 ↦ Φ.org.eolang.as-phi (α0 ↦ ξ)) ⟧, λ ⤍ Package ⟧, λ ⤍ Package ⟧ ⟧ }
diff --git a/eo-phi-normalizer/test/eo/phi/metrics.yaml b/eo-phi-normalizer/test/eo/phi/metrics.yaml
@@ -2,36 +2,37 @@ title: Metrics tests
 tests:
 - title: prints-itself
   phi: |
-    {
-      org ↦ ⟦
-        eolang ↦ ⟦
-          prints-itself ↦ ⟦
-            φ ↦
-              Φ.org.eolang.as-phi(
-                α0 ↦ ξ
-              ).length.gt(
-                α0 ↦ Φ.org.eolang.int(
-                  α0 ↦ Φ.org.eolang.bytes(
-                    Δ ⤍ 00-00-00-00-00-00-00-00
+    { ⟦
+        org ↦ ⟦
+          eolang ↦ ⟦
+            prints-itself ↦ ⟦
+              φ ↦
+                Φ.org.eolang.as-phi(
+                  α0 ↦ ξ
+                ).length.gt(
+                  α0 ↦ Φ.org.eolang.int(
+                    α0 ↦ Φ.org.eolang.bytes(
+                      Δ ⤍ 00-00-00-00-00-00-00-00
+                    )
                   )
                 )
+            ⟧,
+            prints-itself-to-console ↦ ⟦
+              x ↦ Φ.org.eolang.int(
+                α0 ↦ Φ.org.eolang.bytes(
+                  Δ ⤍ 00-00-00-00-00-00-00-2A
+                )
+              ),
+              φ ↦ Φ.org.eolang.io.stdout(
+                α0 ↦ Φ.org.eolang.as-phi(
+                  α0 ↦ ξ
+                )
               )
-          ⟧,
-          prints-itself-to-console ↦ ⟦
-            x ↦ Φ.org.eolang.int(
-              α0 ↦ Φ.org.eolang.bytes(
-                Δ ⤍ 00-00-00-00-00-00-00-2A
-              )
-            ),
-            φ ↦ Φ.org.eolang.io.stdout(
-              α0 ↦ Φ.org.eolang.as-phi(
-                α0 ↦ ξ
-              )
-            )
+            ⟧,
+            λ ⤍ Package
           ⟧,
           λ ⤍ Package
-        ⟧,
-        λ ⤍ Package
+        ⟧
       ⟧
     }
   metrics:

diff --git a/eo-phi-normalizer/test/eo/phi/rule-1.yaml b/eo-phi-normalizer/test/eo/phi/rule-1.yaml
@@ -2,24 +2,24 @@ title: Tests for Rule 1
 tests:
   - name: 'Program without vertices (1)'
     input: |
-      {a ↦ ⟦ ⟧ }
+      {⟦ a ↦ ⟦ ⟧   ⟧}
     normalized: |
-      { a ↦ ⟦ ν ↦ ⟦ Δ ⤍ 00- ⟧ ⟧ }
+      { ⟦ a ↦ ⟦ ν ↦ ⟦ Δ ⤍ 00- ⟧ ⟧ ⟧ }
     prettified: |
-      { }
+      { ⟦ a ↦ ⟦ ⟧ ⟧ }
 
   - name: 'Program without vertices (2)'
     input: |
-      { a ↦ ⟦ φ ↦ ⟦ φ ↦ ⟦ φ ↦ ⟦ ⟧ ⟧ ⟧ ⟧ }
+      { ⟦ a ↦ ⟦ φ ↦ ⟦ φ ↦ ⟦ φ ↦ ⟦ ⟧ ⟧ ⟧ ⟧ ⟧ }
     normalized: |
-      { a ↦ ⟦ ν ↦ ⟦ Δ ⤍ 03- ⟧, φ ↦ ⟦ ν ↦ ⟦ Δ ⤍ 02- ⟧, φ ↦ ⟦ ν ↦ ⟦ Δ ⤍ 01- ⟧, φ ↦ ⟦ ν ↦ ⟦ Δ ⤍ 00- ⟧ ⟧ ⟧ ⟧ ⟧ }
+      { ⟦ a ↦ ⟦ ν ↦ ⟦ Δ ⤍ 03- ⟧, φ ↦ ⟦ ν ↦ ⟦ Δ ⤍ 02- ⟧, φ ↦ ⟦ ν ↦ ⟦ Δ ⤍ 01- ⟧, φ ↦ ⟦ ν ↦ ⟦ Δ ⤍ 00- ⟧ ⟧ ⟧ ⟧ ⟧ ⟧ }
     prettified: |
-      { a ↦ ⟦ φ ↦ ⟦ φ ↦ ⟦ φ ↦ ⟦ ⟧ ⟧ ⟧ ⟧ }
+      { ⟦ a ↦ ⟦ φ ↦ ⟦ φ ↦ ⟦ φ ↦ ⟦ ⟧ ⟧ ⟧ ⟧ ⟧ }
 
   - name: 'Program without vertices (3)'
     input: |
-      { a ↦ ⟦ φ ↦ ⟦ ⟧ , a ↦ ξ.φ ⟧ }
+      { ⟦ a ↦ ⟦ φ ↦ ⟦ ⟧ , a ↦ ξ.φ ⟧ ⟧ }
     normalized: |
-      { a ↦ ⟦ ν ↦ ⟦ Δ ⤍ 01- ⟧, φ ↦ ⟦ ν ↦ ⟦ Δ ⤍ 00- ⟧ ⟧, a ↦ ξ.φ ⟧ }
+      { ⟦ a ↦ ⟦ ν ↦ ⟦ Δ ⤍ 01- ⟧, φ ↦ ⟦ ν ↦ ⟦ Δ ⤍ 00- ⟧ ⟧, a ↦ ξ.φ ⟧ ⟧ }
     prettified: |
-      { a ↦ ⟦ φ ↦ ⟦ ⟧, a ↦ ξ.φ ⟧ }
+      { ⟦ a ↦ ⟦ φ ↦ ⟦ ⟧, a ↦ ξ.φ ⟧ ⟧ }
diff --git a/eo-phi-normalizer/test/eo/phi/rule-6.yaml b/eo-phi-normalizer/test/eo/phi/rule-6.yaml
@@ -2,14 +2,14 @@ title: Tests for Rule 6
 tests:
   - name: "Case (1)"
     input: |
-      { a ↦ ⟦ b ↦ ⟦ Δ ⤍ 00- ⟧, c ↦ ⟦ Δ ⤍ 03- ⟧ ⟧.b }
+      { ⟦ a ↦ ⟦ b ↦ ⟦ Δ ⤍ 00- ⟧, c ↦ ⟦ Δ ⤍ 03- ⟧ ⟧.b ⟧ }
     normalized: |
-      { a ↦ ⟦ Δ ⤍ 00- ⟧(ρ ↦ ⟦ c ↦ ⟦ Δ ⤍ 03- ⟧ ⟧) }
+      { ⟦ a ↦ ⟦ Δ ⤍ 00- ⟧(ρ ↦ ⟦ c ↦ ⟦ Δ ⤍ 03- ⟧ ⟧) ⟧ }
     prettified: |
-      { a ↦ ⟦ b ↦ ⟦ Δ ⤍ 00- ⟧, c ↦ ⟦ Δ ⤍ 03- ⟧ ⟧.b }
+      { ⟦ a ↦ ⟦ b ↦ ⟦ Δ ⤍ 00- ⟧, c ↦ ⟦ Δ ⤍ 03- ⟧ ⟧.b ⟧ }
   - name: "Case (2)"
     input: |
-      {
+      { ⟦
         a ↦
           ⟦
             b ↦
@@ -19,11 +19,12 @@ tests:
               ⟧,
             e ↦ ξ.b(c ↦ ⟦⟧).d
           ⟧.e
+        ⟧
       }
     normalized: |
-      { a ↦ ξ.b (c ↦ ⟦ ⟧).d (ρ ↦ ⟦ b ↦ ⟦ c ↦ ∅, d ↦ ⟦ φ ↦ ξ.ρ.c ⟧ ⟧ ⟧) }
+      { ⟦ a ↦ ξ.b (c ↦ ⟦ ⟧).d (ρ ↦ ⟦ b ↦ ⟦ c ↦ ∅, d ↦ ⟦ φ ↦ ξ.ρ.c ⟧ ⟧ ⟧) ⟧ }
     prettified: |
-      {
+      { ⟦
         a ↦
           ⟦
             b ↦
@@ -33,4 +34,5 @@ tests:
               ⟧,
             e ↦ ξ.b(c ↦ ⟦⟧).d
           ⟧.e
+        ⟧
       }