jievro-parser 0.8.0 → 0.9.0

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

@@ -1,4 +1,4 @@
-module Kauri
+module Jievro
   grammar PatternWildcard
 
     rule pattern_wildcard

data/lib/jievro/parser/grammar/statement/branch/branch.treetop

@@ -1,11 +1,11 @@
 require 'jievro/parser/grammar/statement/branch/if'
 
-module Kauri
+module Jievro
   module Grammar
     module Statement
       grammar Branch
 
-        include Kauri::StatementIf
+        include Jievro::StatementIf
 
         rule statement_branch
           statement_if

data/lib/jievro/parser/grammar/statement/branch/if.treetop

@@ -1,4 +1,4 @@
-module Kauri
+module Jievro
   grammar StatementIf
 
     rule statement_if

data/lib/jievro/parser/grammar/statement/loop/do_while.treetop

@@ -1,4 +1,4 @@
-module Kauri
+module Jievro
   grammar StatementDoWhile
 
     rule statement_do_while

data/lib/jievro/parser/grammar/statement/loop/for.treetop

@@ -1,4 +1,4 @@
-module Kauri
+module Jievro
   grammar StatementFor
 
     rule statement_for

data/lib/jievro/parser/grammar/statement/loop/for_in.treetop

@@ -1,4 +1,4 @@
-module Kauri
+module Jievro
   grammar StatementForIn
 
     rule statement_for_in

data/lib/jievro/parser/grammar/statement/loop/loop.treetop

@@ -3,15 +3,15 @@ require 'jievro/parser/grammar/statement/loop/for_in'
 require 'jievro/parser/grammar/statement/loop/while'
 require 'jievro/parser/grammar/statement/loop/do_while'
 
-module Kauri
+module Jievro
   module Grammar
     module Statement
       grammar Loop
 
-        include Kauri::StatementFor
-        include Kauri::StatementForIn
-        include Kauri::StatementWhile
-        include Kauri::StatementDoWhile
+        include Jievro::StatementFor
+        include Jievro::StatementForIn
+        include Jievro::StatementWhile
+        include Jievro::StatementDoWhile
 
         rule statement_loop
           statement_for_in / statement_for / statement_while / statement_do_while

data/lib/jievro/parser/grammar/statement/loop/while.treetop

@@ -1,4 +1,4 @@
-module Kauri
+module Jievro
   grammar StatementWhile
 
     rule statement_while

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

@@ -1,11 +1,11 @@
 require 'jievro/parser/grammar/statement/loop/loop'
 require 'jievro/parser/grammar/statement/branch/branch'
 
-module Kauri
+module Jievro
   grammar Statement
 
-    include Kauri::Grammar::Statement::Loop
-    include Kauri::Grammar::Statement::Branch
+    include Jievro::Grammar::Statement::Loop
+    include Jievro::Grammar::Statement::Branch
 
     rule statement
       statement_loop / statement_branch / expression_statement / declaration_statement

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

@@ -2,14 +2,16 @@ require 'jievro/parser/grammar/type/type_identifier'
 require 'jievro/parser/grammar/type/type_array'
 require 'jievro/parser/grammar/type/type_dictionary'
 require 'jievro/parser/grammar/type/type_annotation'
+require 'jievro/parser/grammar/type/type_inheritance_clause'
 
-module Kauri
+module Jievro
   grammar Type
 
-    include Kauri::TypeIdentifier
-    include Kauri::TypeArray
-    include Kauri::TypeDictionary
-    include Kauri::TypeAnnotation
+    include Jievro::TypeIdentifier
+    include Jievro::TypeArray
+    include Jievro::TypeDictionary
+    include Jievro::TypeAnnotation
+    include Jievro::TypeInheritanceClause
 
     rule type
       type_identifier / type_dictionary / type_array

data/lib/jievro/parser/grammar/type/type_annotation.treetop

@@ -1,4 +1,4 @@
-module Kauri
+module Jievro
   grammar TypeAnnotation
 
     rule type_annotation

data/lib/jievro/parser/grammar/type/type_array.treetop

@@ -1,4 +1,4 @@
-module Kauri
+module Jievro
   grammar TypeArray
 
     rule type_array

data/lib/jievro/parser/grammar/type/type_dictionary.treetop

@@ -1,4 +1,4 @@
-module Kauri
+module Jievro
   grammar TypeDictionary
 
     rule type_dictionary

data/lib/jievro/parser/grammar/type/type_identifier.treetop

@@ -1,31 +1,24 @@
-module Kauri
+module Jievro
   grammar TypeIdentifier
 
     rule type_identifier
       type_name:type_name ws:_ generic_argument_clause:generic_argument_clause? {
         def tokens
-
           tokens = []
 
           tokens.concat(type_name.tokens)
-
-          unless ws.text_value.empty?
-            tokens.concat(ws.tokens)
-          end
-
-          unless generic_argument_clause.text_value.empty?
-            tokens.concat(generic_argument_clause.tokens)
-          end
+          tokens.concat(ws.tokens) unless ws.text_value.empty?
+          tokens.concat(generic_argument_clause.tokens) \
+            unless generic_argument_clause.text_value.empty?
 
           tokens
         end
-        def ast
 
+        def ast
           ast = type_name.ast
 
-          unless generic_argument_clause.text_value.empty?
-            ast.first[:parameters] = generic_argument_clause.ast
-          end
+          ast.first[:parameters] = generic_argument_clause.ast \
+            unless generic_argument_clause.text_value.empty?
 
           ast
         end

data/lib/jievro/parser/grammar/type/type_inheritance_clause.treetop

@@ -0,0 +1,57 @@
+module Jievro
+  grammar TypeInheritanceClause
+
+    rule type_inheritance_clause
+      ':' ws:_ list:type_inheritance_list {
+        def tokens
+          tokens = []
+
+          tokens.push(T_COLON)
+          tokens.concat(ws.tokens) unless ws.text_value.empty?
+          tokens.concat(list.tokens)
+
+          tokens
+        end
+
+        def ast
+          list.ast
+        end
+      }
+    end
+
+    rule type_inheritance_list
+      head:(type:type_identifier ws1:_ ',' ws2:_)* tail:type_identifier {
+        def tokens
+          tokens = []
+
+          unless head.text_value.empty?
+            head.elements.each { |e|
+              tokens.concat(e.type.tokens)
+              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?
+            }
+          end
+
+          tokens.concat(tail.tokens)
+
+          tokens
+        end
+
+        def ast
+          ast = []
+
+          unless head.text_value.empty?
+            head.elements.each { |e|
+              ast.concat(e.type.ast)
+            }
+          end
+
+          ast.concat(tail.ast)
+
+          ast
+        end
+      }
+    end
+  end
+end

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

@@ -1,4 +1,4 @@
-module Kauri
+module Jievro
   grammar Whitespace
 
     rule _

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

@@ -1,4 +1,4 @@
-module Kauri
+module Jievro
   grammar Wildcard
 
     rule wildcard

data/lib/jievro/parser/string_parser.rb

@@ -8,9 +8,7 @@ module Jievro
   module Parser
     class StringParser
       def parse(source)
-
         parser = Jievro::SwiftParser.new
-
         tokens = []
         ast = {
           __type: 'program',
@@ -18,13 +16,10 @@ module Jievro
         }
 
         unless source.empty?
-
           parsed = parser.parse(source)
 
-          if parsed.nil?
-            raise Exception, parser.failure_reason
-          end
-
+          fail Exception, parser.failure_reason if parsed.nil?
+          
           tokens = parsed.tokens
           ast = parsed.ast
         end

data/lib/jievro/parser/tools/converter/binary_string_to_int_converter.rb

@@ -1,18 +1,17 @@
-module Kauri
+module Jievro
   module Tools
     module Converter
       class BinaryStringToIntConverter
         def convert(binary_string)
+          fail Exception, 'Cannot convert non `String\' values' \
+            unless binary_string.is_a?(String)
 
-          raise Exception, 'Cannot convert non `String\' values' \
-            unless binary_string.kind_of?(String)
-
-          raise Exception, 'String to convert do not match the regular format' \
+          fail Exception, 'String to convert do not match the regular format' \
             unless binary_string =~ /^0b[01_]+$/i
 
-          clean_string = binary_string.gsub! /0b|_*/, ''
+          clean_string = binary_string.gsub!(/0b|_*/, '')
 
-          clean_string.to_i(base=2)
+          clean_string.to_i(2)
         end
       end
     end

data/lib/jievro/parser/tools/converter/converter.rb

@@ -1,4 +1,4 @@
-module Kauri
+module Jievro
   module Tools
     module Converter
       require 'jievro/parser/tools/converter/binary_string_to_int_converter'

data/lib/jievro/parser/tools/converter/decimal_float_string_to_float_converter.rb

@@ -1,18 +1,17 @@
-module Kauri
+module Jievro
   module Tools
     module Converter
       class DecimalFloatStringToFloatConverter
         def convert(decimal_float_string)
-
-          raise Exception, 'Cannot convert non `String\' values' \
-            unless decimal_float_string.kind_of?(String)
+          fail Exception, 'Cannot convert non `String\' values' \
+            unless decimal_float_string.is_a?(String)
 
           # the regex that match a decimal floating number is not exact
           # but for this purpose should be fine
-          raise Exception, 'String do not match the regular format' \
+          fail Exception, 'String do not match the regular format' \
             unless decimal_float_string =~ /^[0-9_]+.?[0-9_]*e?[+-]?[0-9_]*$/i
 
-          clean_string = decimal_float_string.gsub! /_*/, ''
+          clean_string = decimal_float_string.gsub!(/_*/, '')
 
           clean_string.to_f
         end

data/lib/jievro/parser/tools/converter/decimal_string_to_int_converter.rb

@@ -1,16 +1,15 @@
-module Kauri
+module Jievro
   module Tools
     module Converter
       class DecimalStringToIntConverter
         def convert(decimal_string)
+          fail Exception, 'Cannot convert non `String\' values' \
+            unless decimal_string.is_a?(String)
 
-          raise Exception, 'Cannot convert non `String\' values' \
-            unless decimal_string.kind_of?(String)
-
-          raise Exception, 'String to convert do not match the regular format' \
+          fail Exception, 'String to convert do not match the regular format' \
             unless decimal_string =~ /^[0-9_]+$/i
 
-          clean_string = decimal_string.gsub! /_*/, ''
+          clean_string = decimal_string.gsub!(/_*/, '')
 
           clean_string.to_i
         end

data/lib/jievro/parser/tools/converter/hexadecimal_float_string_to_float_converter.rb

@@ -1,40 +1,35 @@
-module Kauri
+module Jievro
   module Tools
     module Converter
       class HexadecimalFloatStringToFloatConverter
         def convert(hexadecimal_float_string)
+          fail Exception, 'Cannot convert non `String\' values' \
+            unless hexadecimal_float_string.is_a?(String)
 
-          raise Exception, 'Cannot convert non `String\' values' \
-            unless hexadecimal_float_string.kind_of?(String)
-
-          clean_string = hexadecimal_float_string.gsub! /_*/, ''
+          clean_string = hexadecimal_float_string.gsub!(/\_*/, '')
 
           match = clean_string.match(/^0x([0-9a-f]+).?([0-9a-f]*)p([+-]?)([0-9]+)$/i)
 
-          raise Exception, 'String to convert do not match the regular format' \
+          fail Exception, 'String to convert do not match the regular format' \
             unless match
 
           captures = match.captures
 
-          integer              = captures[0].to_i(base=16).to_f
+          integer              = captures[0].to_i(16).to_f
           mantissa_hexadecimal = captures[1]
           negative_exponent    = captures[2] == '-'
           exponent             = captures[3].to_i
 
           mantissa = 0.0
-
-          if negative_exponent
-            exponent = -exponent
-          end
-
+          exponent = -exponent if negative_exponent
           mantissa_current_bit_value = 16
 
           mantissa_hexadecimal.each_byte do |mantissa_hexadecimal_char|
-            mantissa += mantissa_hexadecimal_char.chr.to_i(base=16).to_f / mantissa_current_bit_value
+            mantissa += mantissa_hexadecimal_char.chr.to_i(16).to_f / mantissa_current_bit_value
             mantissa_current_bit_value <<= 4
           end
 
-          (integer + mantissa) * (2 ** exponent)
+          (integer + mantissa) * (2**exponent)
         end
       end
     end

data/lib/jievro/parser/tools/converter/hexadecimal_string_to_int_converter.rb

@@ -1,18 +1,17 @@
-module Kauri
+module Jievro
   module Tools
     module Converter
       class HexadecimalStringToIntConverter
         def convert(hexadecimal_string)
+          fail Exception, 'Cannot convert non `String\' values' \
+            unless hexadecimal_string.is_a?(String)
 
-          raise Exception, 'Cannot convert non `String\' values' \
-            unless hexadecimal_string.kind_of?(String)
-
-          raise Exception, 'String to convert do not match the regular format' \
+          fail Exception, 'String to convert do not match the regular format' \
             unless hexadecimal_string =~ /^0x[0-9a-f_]+$/i
 
           clean_string = hexadecimal_string.gsub!(/0x|_*/, '')
 
-          clean_string.to_i(base=16)
+          clean_string.to_i(16)
         end
       end
     end

data/lib/jievro/parser/tools/converter/octal_string_to_int_converter.rb

@@ -1,18 +1,17 @@
-module Kauri
+module Jievro
   module Tools
     module Converter
       class OctalStringToIntConverter
         def convert(octal_string)
+          fail Exception, 'Cannot convert non `String\' values' \
+            unless octal_string.is_a?(String)
 
-          raise Exception, 'Cannot convert non `String\' values' \
-            unless octal_string.kind_of?(String)
-
-          raise Exception, 'String to convert do not match the regular format' \
+          fail Exception, 'String to convert do not match the regular format' \
             unless octal_string =~ /^0o[0-7_]+$/i
 
           clean_string = octal_string.gsub!(/_*/, '')
 
-          clean_string.to_i(base=8)
+          clean_string.to_i(8)
         end
       end
     end