jievro-parser 0.8.0 → 0.9.0

data/lib/jievro/parser/grammar/literal/literal_hexadecimal_floating_point.treetop

@@ -1,6 +1,4 @@
-require 'jievro/parser/tools/converter/converter'
-
-module Kauri
+module Jievro
   grammar LiteralHexadecimalFloatingPoint
 
     rule literal_hexadecimal_floating_point
@@ -11,16 +9,12 @@ module Kauri
       ) {
         def tokens
           [
-            {
-              type: 'T_LITERAL_FLOATING_POINT_HEXADECIMAL',
-              value: text_value
-            }
+            T_LITERAL_FLOATING_POINT_HEXADECIMAL(text_value)
           ]
         end
 
         def ast
-
-          converter = Kauri::Tools::Converter::HexadecimalFloatStringToFloatConverter.new
+          converter = Jievro::Tools::Converter::HexadecimalFloatStringToFloatConverter.new
 
           [
             {

data/lib/jievro/parser/grammar/literal/literal_integer_binary.treetop

@@ -1,22 +1,16 @@
-require 'jievro/parser/tools/converter/converter'
-
-module Kauri
+module Jievro
   grammar LiteralIntegerBinary
 
     rule literal_integer_binary
       '0b' binary_digit binary_literal_characters? {
         def tokens
           [
-            {
-              type: 'T_LITERAL_INTEGER_BINARY',
-              value: text_value
-            }
+            T_LITERAL_INTEGER_BINARY(text_value)
           ]
         end
 
         def ast
-
-          converter = Kauri::Tools::Converter::BinaryStringToIntConverter.new
+          converter = Jievro::Tools::Converter::BinaryStringToIntConverter.new
 
           [
             {

data/lib/jievro/parser/grammar/literal/literal_integer_decimal.treetop

@@ -1,22 +1,16 @@
-require 'jievro/parser/tools/converter/converter'
-
-module Kauri
+module Jievro
   grammar LiteralIntegerDecimal
 
     rule literal_integer_decimal
       decimal_digit decimal_literal_characters? {
         def tokens
           [
-            {
-              type: 'T_LITERAL_INTEGER_DECIMAL',
-              value: text_value
-            }
+            T_LITERAL_INTEGER_DECIMAL(text_value)
           ]
         end
 
         def ast
-
-          converter = Kauri::Tools::Converter::DecimalStringToIntConverter.new
+          converter = Jievro::Tools::Converter::DecimalStringToIntConverter.new
 
           [
             {

data/lib/jievro/parser/grammar/literal/literal_integer_hexadecimal.treetop

@@ -1,22 +1,16 @@
-require 'jievro/parser/tools/converter/converter'
-
-module Kauri
+module Jievro
   grammar LiteralIntegerHexadecimal
 
     rule literal_integer_hexadecimal
       '0x' hexadecimal_digit hexadecimal_literal_characters? {
         def tokens
           [
-            {
-              type: 'T_LITERAL_INTEGER_HEXADECIMAL',
-              value: text_value
-            }
+            T_LITERAL_INTEGER_HEXADECIMAL(text_value)
           ]
         end
 
         def ast
-
-          converter = Kauri::Tools::Converter::HexadecimalStringToIntConverter.new
+          converter = Jievro::Tools::Converter::HexadecimalStringToIntConverter.new
 
           [
             {

data/lib/jievro/parser/grammar/literal/literal_integer_octal.treetop

@@ -1,22 +1,16 @@
-require 'jievro/parser/tools/converter/converter'
-
-module Kauri
+module Jievro
   grammar LiteralIntegerOctal
 
     rule literal_integer_octal
       '0o' octal_digit octal_literal_characters? {
         def tokens
           [
-            {
-              type: 'T_LITERAL_INTEGER_OCTAL',
-              value: text_value
-            }
+            T_LITERAL_INTEGER_OCTAL(text_value)
           ]
         end
 
         def ast
-
-          converter = Kauri::Tools::Converter::OctalStringToIntConverter.new
+          converter = Jievro::Tools::Converter::OctalStringToIntConverter.new
 
           [
             {

data/lib/jievro/parser/grammar/literal/literal_nil.treetop

@@ -1,15 +1,10 @@
-module Kauri
+module Jievro
   grammar LiteralNil
 
     rule literal_nil
       'nil' {
         def tokens
-          [
-            {
-              type: 'T_NIL',
-              value: text_value
-            }
-          ]
+          [T_NIL]
         end
 
         def ast

data/lib/jievro/parser/grammar/literal/literal_numeric.treetop

@@ -4,26 +4,24 @@ require 'jievro/parser/grammar/literal/literal_integer_decimal'
 require 'jievro/parser/grammar/literal/literal_integer_hexadecimal'
 require 'jievro/parser/grammar/literal/literal_decimal_floating_point'
 require 'jievro/parser/grammar/literal/literal_hexadecimal_floating_point'
+require 'jievro/parser/tools/converter/converter'
 
-module Kauri
+module Jievro
   grammar LiteralNumeric
 
-    include Kauri::LiteralIntegerBinary
-    include Kauri::LiteralIntegerOctal
-    include Kauri::LiteralIntegerDecimal
-    include Kauri::LiteralIntegerHexadecimal
-    include Kauri::LiteralDecimalFloatingPoint
-    include Kauri::LiteralHexadecimalFloatingPoint
+    include Jievro::LiteralIntegerBinary
+    include Jievro::LiteralIntegerOctal
+    include Jievro::LiteralIntegerDecimal
+    include Jievro::LiteralIntegerHexadecimal
+    include Jievro::LiteralDecimalFloatingPoint
+    include Jievro::LiteralHexadecimalFloatingPoint
 
     rule literal_numeric
       minus:minus? numeric:(literal_floating_point / literal_integer) {
         def tokens
           tokens = []
 
-          unless minus.text_value.empty?
-            tokens.push(minus.tokens)
-          end
-
+          tokens.concat(minus.tokens) unless minus.text_value.empty?
           tokens.concat(numeric.tokens)
 
           tokens
@@ -32,9 +30,7 @@ module Kauri
         def ast
           ast = numeric.ast.first
 
-          unless minus.text_value.empty?
-            ast[:value] = -ast[:value]
-          end
+          ast[:value] = -ast[:value] unless minus.text_value.empty?
 
           [ast]
         end
@@ -58,10 +54,7 @@ module Kauri
     rule minus
       '-' {
         def tokens
-          {
-            type: 'T_MINUS',
-            value: '-'
-          }
+          [T_OPERATOR('-')]
         end
       }
     end

data/lib/jievro/parser/grammar/literal/literal_string.treetop

@@ -1,31 +1,19 @@
-module Kauri
+module Jievro
   grammar LiteralString
 
     rule literal_string
       '"' quoted_text:quoted_text? '"' {
         def tokens
+          tokens = []
 
-          tokens = [
-            {
-              type: 'T_DOUBLE_QUOTE',
-              value: '"'
-            }
-          ]
-
-          unless quoted_text.text_value.empty?
-            tokens.concat(quoted_text.tokens)
-          end
-
-          tokens.push({
-            type: 'T_DOUBLE_QUOTE',
-            value: '"'
-          })
+          tokens.push(T_DOUBLE_QUOTE)
+          tokens.concat(quoted_text.tokens) unless quoted_text.text_value.empty?
+          tokens.push(T_DOUBLE_QUOTE)
 
           tokens
         end
 
         def ast
-
           if quoted_text.text_value.empty?
             ast = [
               {
@@ -56,7 +44,7 @@ module Kauri
           ast = []
           is_interpolated_string = false
           last_node_is_literal_string = false
-          stripper = Kauri::Tools::QuoteStripper.new
+          stripper = Jievro::Tools::QuoteStripper.new
 
           elements.each { |e|
             if e.is_expression
@@ -64,7 +52,6 @@ module Kauri
               last_node_is_literal_string = false
               ast.push(e.ast)
             else
-
               if e.is_quoted_unicode_char
                 value = e.raw_value
               else
@@ -104,12 +91,10 @@ module Kauri
     rule sequence_of_chars
       (escaped_character / standard_character)+ {
         def tokens
-          stripper = Kauri::Tools::QuoteStripper.new
+          stripper = Jievro::Tools::QuoteStripper.new
+
           [
-            {
-              type: 'T_LITERAL_STRING',
-              value: stripper.strip(text_value)
-            }
+            T_LITERAL_STRING(stripper.strip(text_value))
           ]
         end
 
@@ -128,17 +113,9 @@ module Kauri
         def tokens
           tokens = []
 
-          tokens.push({
-            type: 'T_QUOTED_EXPRESSION_OPEN',
-            value: '\('
-          })
-
+          tokens.push(T_QUOTED_EXPRESSION_OPEN)
           tokens.concat(expression.tokens)
-
-          tokens.push({
-            type: 'T_QUOTED_EXPRESSION_CLOSE',
-            value: ')'
-          })
+          tokens.push(T_QUOTED_EXPRESSION_CLOSE)
 
           tokens
         end
@@ -161,18 +138,9 @@ module Kauri
       '\u{' unicode_scalar_digits:unicode_scalar_digits 1..8 '}' {
         def tokens
           [
-            {
-              type: 'T_QUOTED_UNICODE_CHAR_OPEN',
-              value: '\\u' + 123.chr
-            },
-            {
-              type: 'T_UNICODE_CHAR',
-              value: unicode_scalar_digits.text_value
-            },
-            {
-              type: 'T_QUOTED_UNICODE_CHAR_CLOSE',
-              value: 125.chr
-            }
+            T_QUOTED_UNICODE_CHAR_OPEN,
+            T_UNICODE_CHAR(unicode_scalar_digits.text_value),
+            T_QUOTED_UNICODE_CHAR_CLOSE
           ]
         end
 

data/lib/jievro/parser/grammar/operator.treetop

@@ -1,4 +1,4 @@
-module Kauri
+module Jievro
   grammar Operator
 
     rule operator

data/lib/jievro/parser/grammar/pattern/pattern.treetop

@@ -2,12 +2,12 @@ require 'jievro/parser/grammar/pattern/pattern_wildcard'
 require 'jievro/parser/grammar/pattern/pattern_identifier'
 require 'jievro/parser/grammar/pattern/pattern_initializer'
 
-module Kauri
+module Jievro
   grammar Pattern
 
-    include Kauri::PatternWildcard
-    include Kauri::PatternIdentifier
-    include Kauri::PatternInitializer
+    include Jievro::PatternWildcard
+    include Jievro::PatternIdentifier
+    include Jievro::PatternInitializer
 
     rule pattern
       pattern_wildcard / pattern_identifier

data/lib/jievro/parser/grammar/pattern/pattern_identifier.treetop

@@ -1,4 +1,4 @@
-module Kauri
+module Jievro
   grammar PatternIdentifier
 
     rule pattern_identifier

data/lib/jievro/parser/grammar/pattern/pattern_initializer.treetop

@@ -1,4 +1,4 @@
-module Kauri
+module Jievro
   grammar PatternInitializer
 
     rule untyped_pattern_initializer
@@ -7,29 +7,20 @@ module Kauri
           tokens = []
 
           tokens.concat(pattern.tokens)
-
-          unless ws.text_value.empty?
-            tokens.concat(ws.tokens)
-          end
-
-          unless initializer.text_value.empty?
-            tokens.concat(initializer.tokens)
-          end
+          tokens.concat(ws.tokens) unless ws.text_value.empty?
+          tokens.concat(initializer.tokens) unless initializer.text_value.empty?
 
           tokens
         end
 
         def ast
-
           ast = {
             pattern: pattern.ast.first
           }
 
           ast[:pattern] = pattern.ast.first
-
-          unless initializer.text_value.empty?
-            ast[:initializer] = initializer.ast.first
-          end
+          ast[:initializer] = initializer.ast.first \
+            unless initializer.text_value.empty?
 
           ast
         end
@@ -42,20 +33,10 @@ module Kauri
           tokens = []
 
           tokens.concat(pattern.tokens)
-
-          unless ws1.text_value.empty?
-            tokens.concat(ws1.tokens)
-          end
-
+          tokens.concat(ws1.tokens) unless ws1.text_value.empty?
           tokens.concat(type_annotation.tokens)
-
-          unless ws2.text_value.empty?
-            tokens.concat(ws2.tokens)
-          end
-
-          unless initializer.text_value.empty?
-            tokens.concat(initializer.tokens)
-          end
+          tokens.concat(ws2.tokens) unless ws2.text_value.empty?
+          tokens.concat(initializer.tokens) unless initializer.text_value.empty?
 
           tokens
         end
@@ -65,10 +46,8 @@ module Kauri
 
           ast[:pattern] = pattern.ast.first
           ast[:pattern][:type] = type_annotation.ast.first
-
-          unless initializer.text_value.empty?
-            ast[:initializer] = initializer.ast.first
-          end
+          ast[:initializer] = initializer.ast.first \
+            unless initializer.text_value.empty?
 
           ast
         end
@@ -90,30 +69,19 @@ module Kauri
     rule pattern_initializer_list
       head:pattern_initializer_list_head? ws:_ tail:pattern_initializer {
         def tokens
-
           tokens = []
 
-          unless head.text_value.empty?
-            tokens.concat(head.tokens)
-          end
-
-          unless ws.text_value.empty?
-            tokens.concat(ws.tokens)
-          end
-
+          tokens.concat(head.tokens) unless head.text_value.empty?
+          tokens.concat(ws.tokens) unless ws.text_value.empty?
           tokens.concat(tail.tokens)
 
           tokens
         end
 
         def ast
-
           ast = []
 
-          unless head.text_value.empty?
-            ast.concat(head.ast)
-          end
-
+          ast.concat(head.ast) unless head.text_value.empty?
           ast.push(tail.ast)
 
           ast
@@ -124,32 +92,19 @@ module Kauri
     rule pattern_initializer_list_head
       (pattern_initializer:pattern_initializer ws1:_ ',' ws2:_)+ {
         def tokens
-
           tokens = []
 
           elements.each { |e|
-
             tokens.concat(e.pattern_initializer.tokens)
-
-            unless e.ws1.text_value.empty?
-              tokens.concat(e.ws1.tokens)
-            end
-
-            tokens.push({
-              type: 'T_COMMA',
-              value: ','
-            })
-
-            unless e.ws2.text_value.empty?
-              tokens.concat(e.ws2.tokens)
-            end
+            tokens.concat(e.ws1.tokens) unless e.ws1.text_value.empty?
+            tokens.push(T_COMMA)
+            tokens.concat(e.ws2.tokens) unless e.ws2.text_value.empty?
           }
 
           tokens
         end
 
         def ast
-
           ast = []
 
           elements.each { |e|
@@ -166,15 +121,8 @@ module Kauri
         def tokens
           tokens = []
 
-          tokens.push({
-            type: 'T_OPERATOR',
-            value: '='
-          })
-
-          unless ws.text_value.empty?
-            tokens.concat(ws.tokens)
-          end
-
+          tokens.push(T_OPERATOR('='))
+          tokens.concat(ws.tokens) unless ws.text_value.empty?
           tokens.concat(expression.tokens)
 
           tokens