Merge branch 'master' into rule-1

objectionary · Jan 10, 2024 · 5511306 · 5511306
2 parents b296cdd + c1b2a13
commit 5511306
Show file tree

Hide file tree

Showing 7 changed files with 132 additions and 118 deletions.
diff --git a/.github/workflows/ghc.yml b/.github/workflows/ghc.yml
@@ -24,7 +24,7 @@ jobs:
 
     steps:
       - name: 📥 Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: 🧰 Setup Stack
         uses: freckle/stack-action@v4
@@ -39,7 +39,7 @@ jobs:
 
     steps:
       - name: 📥 Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: 🧰 Setup Stack
         uses: freckle/stack-action@v4

diff --git a/eo-phi-normalizer/grammar/EO/Phi/Syntax.cf b/eo-phi-normalizer/grammar/EO/Phi/Syntax.cf
@@ -14,8 +14,8 @@ token AlphaIndex ({"α0"} | {"α"} (digit - ["0"]) (digit)* ) ;
 
 Program. Program ::= "{" [Binding] "}" ;
 
-Formation.      Object ::= "{" [Binding] "}" ;
-Application.    Object ::= Object "{" [Binding] "}" ;
+Formation.      Object ::= "⟦" [Binding] "⟧" ;
+Application.    Object ::= Object "(" [Binding] ")" ;
 ObjectDispatch. Object ::= Object "." Attribute ;
 GlobalDispatch. Object ::= "Φ" "." Attribute ;
 ThisDispatch.   Object ::= "ξ" "." Attribute ;

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/renovate.json b/renovate.json
@@ -0,0 +1,6 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "extends": [
+    "config:recommended"
+  ]
+}