parser: fix integer literals

GayPizzaSpecifications · Sep 12, 2023 · f64a54f · f64a54f
1 parent 1b363dc
commit f64a54f
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 8 deletions.
diff --git a/parser/src/main/kotlin/gay/pizza/pork/parser/Parser.kt b/parser/src/main/kotlin/gay/pizza/pork/parser/Parser.kt
@@ -13,11 +13,11 @@ class Parser(source: PeekableSource<Token>, val attribution: NodeAttribution) {
       } else {
         val integer = it.text.toIntOrNull()
         if (integer != null) {
-          IntegerLiteral(integer)
+          return@expect IntegerLiteral(integer)
         }
         val long = it.text.toLongOrNull()
         if (long != null) {
-          LongLiteral(long)
+          return@expect LongLiteral(long)
         }
         throw ParseError("Illegal integer value")
       }

diff --git a/support/pork-idea/src/main/kotlin/gay/pizza/pork/idea/PorkElementTypes.kt b/support/pork-idea/src/main/kotlin/gay/pizza/pork/idea/PorkElementTypes.kt
@@ -46,4 +46,6 @@ object PorkElementTypes {
 
   fun elementTypeFor(nodeType: NodeType): IElementType =
     nodeTypeToElementType[nodeType]!!
+
+  val FailedToParse: IElementType = IElementType("FailedToParse", PorkLanguage)
 }
diff --git a/support/pork-idea/src/main/kotlin/gay/pizza/pork/idea/PorkParser.kt b/support/pork-idea/src/main/kotlin/gay/pizza/pork/idea/PorkParser.kt
@@ -17,5 +17,7 @@ class PorkParser : PsiParser {
     return builder.treeBuilt
   }
 
-  class ExitParser(val error: String) : RuntimeException("Exit Parser: $error")
+  class ExitParser(val error: String? = null) : RuntimeException(
+    if (error == null) "Fast Exit" else "Exit Parser: $error"
+  )
 }
diff --git a/support/pork-idea/src/main/kotlin/gay/pizza/pork/idea/PsiBuilderMarkAttribution.kt b/support/pork-idea/src/main/kotlin/gay/pizza/pork/idea/PsiBuilderMarkAttribution.kt
@@ -17,16 +17,20 @@ class PsiBuilderMarkAttribution(val builder: PsiBuilder) : ParserNodeAttribution
       while (!builder.eof()) {
         builder.advanceLexer()
       }
-      throw PorkParser.ExitParser(e.error)
+      throw PorkParser.ExitParser()
     } catch (e: ParseError) {
+      marker.error(e.error)
       while (!builder.eof()) {
         builder.advanceLexer()
       }
-      marker.error(e.error)
-      throw PorkParser.ExitParser(e.error)
+      throw PorkParser.ExitParser()
     } catch (e: PorkParser.ExitParser) {
-      marker.error(e.error)
-      throw e
+      if (e.error != null) {
+        marker.error(e.error)
+      } else {
+        marker.done(PorkElementTypes.FailedToParse)
+      }
+      throw PorkParser.ExitParser()
     }
   }
 }