Fix inconsistencies

spicelang · Aug 9, 2024 · b378f04 · b378f04
1 parent 5474cab
commit b378f04
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 88 deletions.
diff --git a/src/main/gen/com/spicelang/intellij/spice/SpiceParser.java b/src/main/gen/com/spicelang/intellij/spice/SpiceParser.java
diff --git a/src/main/gen/com/spicelang/intellij/spice/psi/SpiceExprStmt.java b/src/main/gen/com/spicelang/intellij/spice/psi/SpiceExprStmt.java
diff --git a/src/main/gen/com/spicelang/intellij/spice/psi/SpiceStmt.java b/src/main/gen/com/spicelang/intellij/spice/psi/SpiceStmt.java
diff --git a/src/main/gen/com/spicelang/intellij/spice/psi/SpiceTypes.java b/src/main/gen/com/spicelang/intellij/spice/psi/SpiceTypes.java
diff --git a/src/main/gen/com/spicelang/intellij/spice/psi/SpiceVisitor.java b/src/main/gen/com/spicelang/intellij/spice/psi/SpiceVisitor.java
diff --git a/src/main/gen/com/spicelang/intellij/spice/psi/impl/SpiceExprStmtImpl.java b/src/main/gen/com/spicelang/intellij/spice/psi/impl/SpiceExprStmtImpl.java
diff --git a/src/main/gen/com/spicelang/intellij/spice/psi/impl/SpiceStmtImpl.java b/src/main/gen/com/spicelang/intellij/spice/psi/impl/SpiceStmtImpl.java
diff --git a/src/main/java/com/spicelang/intellij/spice/Spice.bnf b/src/main/java/com/spicelang/intellij/spice/Spice.bnf
@@ -61,9 +61,8 @@ enumItemLst ::= enumItem (COMMA enumItem)*
 enumItem ::= TYPE_IDENTIFIER (ASSIGN INT_LIT)?
 field ::= dataType IDENTIFIER (ASSIGN assignExpr)?
 signature ::= specifierLst? (F LESS dataType GREATER | P) IDENTIFIER (LESS typeLst GREATER)? LPAREN typeLst? RPAREN SEMICOLON
-stmt ::= (declStmt | assignExpr | returnStmt | breakStmt | continueStmt | fallthroughStmt | exprStmt) SEMICOLON
+stmt ::= (declStmt | assignExpr | returnStmt | breakStmt | continueStmt | fallthroughStmt) SEMICOLON
 declStmt ::= dataType IDENTIFIER (ASSIGN assignExpr)?
-exprStmt ::= assignExpr
 specifierLst ::= specifier+
 specifier ::= CONST | SIGNED | UNSIGNED | INLINE | PUBLIC | HEAP | COMPOSE
 modAttr ::= MOD_ATTR_PREAMBLE LBRACKET attrLst RBRACKET
@@ -87,7 +86,7 @@ lenCall ::= LEN LPAREN assignExpr RPAREN
 panicCall ::= PANIC LPAREN assignExpr RPAREN
 
 // Expression loop
-assignExpr ::= ternaryExpr | prefixUnaryExpr assignOp assignExpr
+assignExpr ::= prefixUnaryExpr assignOp assignExpr | ternaryExpr
 ternaryExpr ::= logicalOrExpr (QUESTION_MARK logicalOrExpr? COLON logicalOrExpr)?
 logicalOrExpr ::= logicalAndExpr (LOGICAL_OR logicalAndExpr)*
 logicalAndExpr ::= bitwiseOrExpr (LOGICAL_AND bitwiseOrExpr)*