Save keywords automatically instead of manually.

mint-lang · gdotdesign · Sep 17, 2023 · Jun 12, 2023 · Jun 13, 2023 · Jun 13, 2023
commit ca01ad6659eab0f563d35db97c9d7be93bec3f01
diff --git a/src/parser.cr b/src/parser.cr
@@ -173,8 +173,8 @@ module Mint
     # Consuming keywords
     # ----------------------------------------------------------------------------
 
-    def keyword!(word, error, save : Bool = false) : Bool
-      keyword(word, save) || raise error
+    def keyword!(word, error) : Bool
+      keyword(word) || raise error
     end
 
     def keyword_ahead?(word) : Bool
@@ -184,9 +184,9 @@ module Mint
       true
     end
 
-    def keyword(word, save : Bool = false) : Bool
+    def keyword(word) : Bool
       if keyword_ahead?(word)
-        if save
+        if word =~ /^[a-z]+$/
           @ast.keywords << {position, position + word.size}
         end
 

diff --git a/src/parsers/array_literal.cr b/src/parsers/array_literal.cr
@@ -18,7 +18,7 @@ module Mint
 
         type = start do
           whitespace
-          next unless keyword("of", true)
+          next unless keyword "of"
           whitespace
           type_or_type_variable! ArrayLiteralExpectedTypeOrVariable
         end

diff --git a/src/parsers/case.cr b/src/parsers/case.cr
@@ -8,14 +8,14 @@ module Mint
 
     def case_expression(for_css : Bool = false) : Ast::Case?
       start do |start_position|
-        next unless keyword("case", true)
+        next unless keyword "case"
 
         whitespace
 
         parens = char! '('
 
         whitespace
-        await = keyword("await", true)
+        await = keyword "await"
 
         whitespace
         condition = expression! CaseExpectedCondition

diff --git a/src/parsers/component.cr b/src/parsers/component.cr
@@ -9,10 +9,10 @@ module Mint
       start do |start_position|
         comment = self.comment
 
-        global = keyword("global", true)
+        global = keyword "global"
         whitespace
 
-        next unless keyword("component", true)
+        next unless keyword "component"
         whitespace
 
         name = type_id! ComponentExpectedName

diff --git a/src/parsers/connect.cr b/src/parsers/connect.cr
@@ -8,13 +8,13 @@ module Mint
 
     def connect : Ast::Connect?
       start do |start_position|
-        next unless keyword("connect", true)
+        next unless keyword "connect"
         whitespace
 
         store = type_id! ConnectExpectedType
         whitespace
 
-        keyword!("exposing", ConnectExpectedExposing, true)
+        keyword! "exposing", ConnectExpectedExposing
 
         keys = block(
           opening_bracket: ConnectExpectedOpeningBracket,

diff --git a/src/parsers/connect_variable.cr b/src/parsers/connect_variable.cr
@@ -10,7 +10,7 @@ module Mint
 
         whitespace
 
-        if keyword("as", true)
+        if keyword "as"
           whitespace
           name = variable! ConnectVariableExpectedAs
         end

diff --git a/src/parsers/constant.cr b/src/parsers/constant.cr
@@ -9,7 +9,7 @@ module Mint
         comment = self.comment
         whitespace
 
-        next unless keyword("const", true)
+        next unless keyword "const"
         whitespace
 
         name = variable_constant!

diff --git a/src/parsers/css_font_face.cr b/src/parsers/css_font_face.cr
@@ -5,7 +5,7 @@ module Mint
 
     def css_font_face : Ast::CssFontFace?
       start do |start_position|
-        next unless keyword("@font-face", true)
+        next unless keyword "@font-face"
 
         definitions = block(
           opening_bracket: CssFontFaceExpectedOpeningBracket,

diff --git a/src/parsers/css_keyframes.cr b/src/parsers/css_keyframes.cr
@@ -6,7 +6,7 @@ module Mint
 
     def css_keyframes : Ast::CssKeyframes?
       start do |start_position|
-        next unless keyword("@keyframes", true)
+        next unless keyword "@keyframes"
 
         whitespace
 

diff --git a/src/parsers/decode.cr b/src/parsers/decode.cr
@@ -6,15 +6,15 @@ module Mint
 
     def decode : Ast::Decode?
       start do |start_position|
-        next unless keyword("decode", true)
+        next unless keyword "decode"
         next unless whitespace?
         whitespace
 
-        unless keyword("as", true)
+        unless keyword "as"
           expression = expression! DecodeExpectedExpression
 
           whitespace
-          keyword!("as", DecodeExpectedAs, true)
+          keyword! "as", DecodeExpectedAs
         end
 
         whitespace

diff --git a/src/parsers/directives/asset.cr b/src/parsers/directives/asset.cr
@@ -6,7 +6,7 @@ module Mint
 
     def asset_directive : Ast::Directives::Asset?
       start do |start_position|
-        next unless keyword("@asset", true)
+        next unless keyword "@asset"
 
         char '(', AssetDirectiveExpectedOpeningParentheses
         whitespace

diff --git a/src/parsers/directives/documentation.cr b/src/parsers/directives/documentation.cr
@@ -6,7 +6,7 @@ module Mint
 
     def documentation_directive : Ast::Directives::Documentation?
       start do |start_position|
-        next unless keyword("@documentation", true)
+        next unless keyword "@documentation"
 
         char '(', DocumentationDirectiveExpectedOpeningParentheses
         whitespace

diff --git a/src/parsers/directives/format.cr b/src/parsers/directives/format.cr
@@ -6,7 +6,7 @@ module Mint
 
     def format_directive : Ast::Directives::Format?
       start do |start_position|
-        next unless keyword("@format", true)
+        next unless keyword "@format"
 
         content =
           code_block(

diff --git a/src/parsers/directives/inline.cr b/src/parsers/directives/inline.cr
@@ -6,7 +6,7 @@ module Mint
 
     def inline_directive : Ast::Directives::Inline?
       start do |start_position|
-        next unless keyword("@inline", true)
+        next unless keyword "@inline"
 
         char '(', InlineDirectiveExpectedOpeningParentheses
         whitespace

diff --git a/src/parsers/directives/svg.cr b/src/parsers/directives/svg.cr
@@ -6,7 +6,7 @@ module Mint
 
     def svg_directive : Ast::Directives::Svg?
       start do |start_position|
-        next unless keyword("@svg", true)
+        next unless keyword "@svg"
 
         char '(', SvgDirectiveExpectedOpeningParentheses
         whitespace

diff --git a/src/parsers/encode.cr b/src/parsers/encode.cr
@@ -4,7 +4,7 @@ module Mint
 
     def encode : Ast::Encode?
       start do |start_position|
-        next unless keyword("encode", true)
+        next unless keyword "encode"
         next unless whitespace?
         whitespace
 

diff --git a/src/parsers/enum.cr b/src/parsers/enum.cr
@@ -9,7 +9,7 @@ module Mint
       start do |start_position|
         comment = self.comment
 
-        next unless keyword("enum", true)
+        next unless keyword "enum"
         whitespace
 
         name = type_id! EnumExpectedName

diff --git a/src/parsers/for.cr b/src/parsers/for.cr
@@ -9,7 +9,7 @@ module Mint
 
     def for_expression : Ast::For?
       start do |start_position|
-        next unless keyword("for", true)
+        next unless keyword "for"
         next unless whitespace?
         whitespace
 
@@ -22,7 +22,7 @@ module Mint
         ) { variable }
 
         whitespace
-        keyword!("of", ForExpectedOf, true)
+        keyword! "of", ForExpectedOf
         whitespace
 
         subject = expression! ForExpectedSubject

diff --git a/src/parsers/for_condition.cr b/src/parsers/for_condition.cr
@@ -6,7 +6,7 @@ module Mint
 
     def for_condition : Ast::ForCondition?
       start do |start_position|
-        next unless keyword("when", true)
+        next unless keyword "when"
         whitespace
 
         condition =

diff --git a/src/parsers/function.cr b/src/parsers/function.cr
@@ -11,7 +11,7 @@ module Mint
       start do |start_position|
         comment = self.comment
 
-        next unless keyword("fun", true)
+        next unless keyword "fun"
         whitespace
 
         name = variable! FunctionExpectedName, track: false

diff --git a/src/parsers/get.cr b/src/parsers/get.cr
@@ -11,7 +11,7 @@ module Mint
       start do |start_position|
         comment = self.comment
 
-        next unless keyword("get", true)
+        next unless keyword "get"
         whitespace
 
         name = variable! GetExpectedName, track: false

diff --git a/src/parsers/html_component.cr b/src/parsers/html_component.cr
@@ -16,7 +16,7 @@ module Mint
 
         ref = start do
           whitespace
-          next unless keyword("as", true)
+          next unless keyword "as"
           whitespace
           variable! HtmlComponentExpectedReference
         end

diff --git a/src/parsers/html_element.cr b/src/parsers/html_element.cr
@@ -25,7 +25,7 @@ module Mint
 
         ref = start do
           whitespace
-          next unless keyword("as", true)
+          next unless keyword "as"
           whitespace
           variable! HtmlElementExpectedReference
         end

diff --git a/src/parsers/if.cr b/src/parsers/if.cr
@@ -11,7 +11,7 @@ module Mint
 
     def if_expression(for_css = false) : Ast::If?
       start do |start_position|
-        next unless keyword("if", true)
+        next unless keyword "if"
 
         whitespace
         parens = char! '('
@@ -40,7 +40,7 @@ module Mint
         falsy = nil
         whitespace
 
-        if keyword("else", true)
+        if keyword "else"
           whitespace
 
           unless falsy = if_expression(for_css: for_css)

diff --git a/src/parsers/js.cr b/src/parsers/js.cr
@@ -15,7 +15,7 @@ module Mint
 
         type = start do
           whitespace
-          next unless keyword("as", true)
+          next unless keyword "as"
           whitespace
           type_or_type_variable! JsExpectedTypeOrVariable
         end

diff --git a/src/parsers/module.cr b/src/parsers/module.cr
@@ -9,7 +9,7 @@ module Mint
         comment = self.comment
         whitespace
 
-        next unless keyword("module", true)
+        next unless keyword "module"
         whitespace
 
         name = type_id! ModuleExpectedName

diff --git a/src/parsers/next_call.cr b/src/parsers/next_call.cr
@@ -4,7 +4,7 @@ module Mint
 
     def next_call : Ast::NextCall?
       start do |start_position|
-        next unless keyword("next", true)
+        next unless keyword "next"
         next unless whitespace?
         whitespace
 

diff --git a/src/parsers/property.cr b/src/parsers/property.cr
@@ -11,7 +11,7 @@ module Mint
 
         start_position = position
 
-        next unless keyword("property", true)
+        next unless keyword "property"
         whitespace
 
         name = variable! PropertyExpectedName, track: false

diff --git a/src/parsers/provider.cr b/src/parsers/provider.cr
@@ -11,7 +11,7 @@ module Mint
       start do |start_position|
         comment = self.comment
 
-        next unless keyword("provider", true)
+        next unless keyword "provider"
         whitespace
 
         name = type_id! ProviderExpectedName

diff --git a/src/parsers/record_definition.cr b/src/parsers/record_definition.cr
@@ -8,7 +8,7 @@ module Mint
       start do |start_position|
         comment = self.comment
 
-        next unless keyword("record", true)
+        next unless keyword "record"
         whitespace
 
         name = type_id! RecordDefinitionExpectedName

diff --git a/src/parsers/record_definition_field.cr b/src/parsers/record_definition_field.cr
@@ -19,7 +19,7 @@ module Mint
         mapping =
           start do
             whitespace
-            next unless keyword("using", true)
+            next unless keyword "using"
             whitespace
             string_literal! RecordDefinitionFieldExpectedMapping,
               with_interpolation: false

diff --git a/src/parsers/return.cr b/src/parsers/return.cr
@@ -4,7 +4,7 @@ module Mint
 
     def return_call : Ast::ReturnCall?
       start do |start_position|
-        next unless keyword("return", true)
+        next unless keyword "return"
         next unless whitespace?
         whitespace
 

diff --git a/src/parsers/routes.cr b/src/parsers/routes.cr
@@ -6,7 +6,7 @@ module Mint
 
     def routes : Ast::Routes?
       start do |start_position|
-        next unless keyword("routes", true)
+        next unless keyword "routes"
 
         body = block(
           opening_bracket: RoutesExpectedOpeningBracket,

diff --git a/src/parsers/state.cr b/src/parsers/state.cr
@@ -10,7 +10,7 @@ module Mint
         comment = self.comment
         whitespace
 
-        next unless keyword("state", true)
+        next unless keyword "state"
         whitespace
 
         name = variable! StateExpectedName

diff --git a/src/parsers/statement.cr b/src/parsers/statement.cr
@@ -3,7 +3,7 @@ module Mint
     def statement : Ast::Statement?
       start do |start_position|
         target = start do
-          next unless keyword("let", true)
+          next unless keyword "let"
           whitespace
 
           value = variable(track: false) ||
@@ -19,7 +19,7 @@ module Mint
         end
 
         whitespace
-        await = keyword("await", true)
+        await = keyword "await"
 
         whitespace
         body = expression

diff --git a/src/parsers/store.cr b/src/parsers/store.cr
@@ -10,7 +10,7 @@ module Mint
         comment = self.comment
         whitespace
 
-        next unless keyword("store", true)
+        next unless keyword "store"
         whitespace
 
         name = type_id! StoreExpectedName