Unify type cast to other language features

spicelang · Feb 14, 2025 · 28eb5a3 · 28eb5a3
1 parent 22955bd
commit 28eb5a3
Show file tree

Hide file tree

Showing 8 changed files with 317 additions and 299 deletions.
diff --git a/src/main/gen/com/spicelang/intellij/spice/SpiceLexer.java b/src/main/gen/com/spicelang/intellij/spice/SpiceLexer.java
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/SpiceCastExpr.java b/src/main/gen/com/spicelang/intellij/spice/psi/SpiceCastExpr.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/impl/SpiceCastExprImpl.java b/src/main/gen/com/spicelang/intellij/spice/psi/impl/SpiceCastExprImpl.java
diff --git a/src/main/java/com/spicelang/intellij/spice/Spice.bnf b/src/main/java/com/spicelang/intellij/spice/Spice.bnf
@@ -100,7 +100,7 @@ relationalExpr ::= shiftExpr ((LESS | GREATER | LESS_EQUAL | GREATER_EQUAL) shif
 shiftExpr ::= additiveExpr ((LESS LESS | GREATER GREATER) additiveExpr)*
 additiveExpr ::= multiplicativeExpr ((PLUS | MINUS) multiplicativeExpr)*
 multiplicativeExpr ::= castExpr ((MUL | DIV | REM) castExpr)*
-castExpr ::= LPAREN dataType RPAREN prefixUnaryExpr | prefixUnaryExpr
+castExpr ::= prefixUnaryExpr | CAST LESS dataType GREATER LPAREN assignExpr RPAREN
 prefixUnaryExpr ::= postfixUnaryExpr | (MINUS | PLUS_PLUS | MINUS_MINUS | NOT | BITWISE_NOT | MUL | BITWISE_AND) prefixUnaryExpr
 postfixUnaryExpr ::= atomicExpr (LBRACKET assignExpr RBRACKET | DOT postfixUnaryExpr | PLUS_PLUS | MINUS_MINUS | SCOPE_ACCESS postfixUnaryExpr)*
 atomicExpr ::= value | (identifierExpr SCOPE_ACCESS)* identifierExpr | builtinCall | LPAREN assignExpr RPAREN {methods=[getIdentifier]}

diff --git a/src/main/java/com/spicelang/intellij/spice/Spice.flex b/src/main/java/com/spicelang/intellij/spice/Spice.flex
@@ -91,6 +91,7 @@ alignof                                           { return SpiceTypes.ALIGNOF; }
 len                                               { return SpiceTypes.LEN; }
 panic                                             { return SpiceTypes.PANIC; }
 syscall                                           { return SpiceTypes.SYSCALL; }
+cast                                              { return SpiceTypes.CAST; }
 ext                                               { return SpiceTypes.EXT; }
 true                                              { return SpiceTypes.TRUE; }
 false                                             { return SpiceTypes.FALSE; }

diff --git a/src/main/java/com/spicelang/intellij/spice/SpiceSyntaxHighlighter.java b/src/main/java/com/spicelang/intellij/spice/SpiceSyntaxHighlighter.java
@@ -120,6 +120,7 @@ public Lexer getHighlightingLexer() {
         if (tokenType.equals(SpiceTypes.LEN)) return BUILTIN_KEY;
         if (tokenType.equals(SpiceTypes.PANIC)) return BUILTIN_KEY;
         if (tokenType.equals(SpiceTypes.SYSCALL)) return BUILTIN_KEY;
+        if (tokenType.equals(SpiceTypes.CAST)) return KEYWORD_KEY;
         if (tokenType.equals(SpiceTypes.EXT)) return KEYWORD_KEY;
         if (tokenType.equals(SpiceTypes.TRUE)) return CONSTANT_KEY;
         if (tokenType.equals(SpiceTypes.FALSE)) return CONSTANT_KEY;