jievro-parser 0.8.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d56703e726b140d5f670a4612faebbfbf231ec1f
-  data.tar.gz: 83a92536b8ee7c04845ba217a70f464258328da6
+  metadata.gz: aada9eec4d85adbc32e3a819a1a6a65d89e08786
+  data.tar.gz: 4d40c2a82ba9259b0fef4a059709c4faf5c6dadc
 SHA512:
-  metadata.gz: 13370ace3ab61ee7218449f6a74e1529cda2b89a00b0c1374f4c23c215a53c4062d4c42fbed6f9006a52d9e6b24f110aca5381dba9ae45f3cd483cbdbcf143b8
-  data.tar.gz: b990775579e54f24dac0144200f23d92b682ec0778e819a65463d8456eb88008a7644c30c51f41d13e24884e713995b8653142d44317f0177fc85499408f0f0e
+  metadata.gz: 54a0bc03018a89e087b2b247419323b2e4ab9f81e43ec4fabea34a5b1e86b14a9a68b8760a7ce5ac887ea5d10c12963f64cba4750f236ddb4c30980e1ca92139
+  data.tar.gz: 930f50adb765c6e68d8dddf929a3c1815b34f0d37847246396939e95a86d4f6cca87b290228f4976013764e0eb5e9ec1fba560c6b6b01fdee95fda59e2ce6d47

data/Gemfile.lock

@@ -1,15 +1,15 @@
 PATH
   remote: .
   specs:
-    jievro-parser (0.8.0)
-      jievro-ast (~> 0.5)
+    jievro-parser (0.9.0)
+      jievro-ast (~> 0.7)
       treetop (~> 1.6)
 
 GEM
   remote: https://rubygems.org/
   specs:
     diff-lcs (1.2.5)
-    jievro-ast (0.5.0)
+    jievro-ast (0.8.1)
     polyglot (0.3.5)
     rake (10.4.2)
     rspec (3.2.0)

data/Rakefile

@@ -2,6 +2,6 @@ require 'rspec'
 require 'rspec/core/rake_task'
 
 RSpec::Core::RakeTask.new(:test) do |t|
-  t.ruby_opts = %w(-I lib  -I spec)
+  t.ruby_opts = %w(-I lib -I spec)
   t.rspec_opts = '--color --format progress --fail-fast'
 end

data/jievro-parser.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '~> 2.0'
 
-  spec.add_runtime_dependency 'jievro-ast', '~> 0.5'
+  spec.add_runtime_dependency 'jievro-ast', '~> 0.7'
   spec.add_runtime_dependency 'treetop', '~> 1.6'
 
   spec.add_development_dependency 'bundler', '~> 1.9'

data/lib/jievro/parser/binary_operator.rb

@@ -1,6 +1,7 @@
 module Jievro
   module Parser
     class BinaryOperator
+      attr_reader :sign, :associativity, :precedence
 
       def initialize(sign, associativity, precedence)
         @sign = sign
@@ -8,54 +9,42 @@ module Jievro
         @precedence = precedence
       end
 
-      def sign
-        @sign
-      end
-
-      def associativity
-        @associativity
-      end
-
-      def precedence
-        @precedence
-      end
-
       def self.get(sign)
         case sign
-          when '<<', '>>'
-            operator = BinaryOperator.new(sign, :none, 160)
-          when '*', '/', '%', '&*', '&/', '&%', '&'
-            operator = BinaryOperator.new(sign, :left, 150)
-          when '+', '-', '&+', '&-', '|', '^'
-            operator = BinaryOperator.new(sign, :left, 140)
-          when '..<', '...'
-            operator = BinaryOperator.new(sign, :none, 135)
-          when 'is', 'as'
-            operator = BinaryOperator.new(sign, :none, 132)
-          when '<', '<=', '>', '>=', '==', '!=', '===', '!==', '~='
-            operator = BinaryOperator.new(sign, :left, 130)
-          when '&&'
-            operator = BinaryOperator.new(sign, :left, 120)
-          when '||'
-            operator = BinaryOperator.new(sign, :left, 110)
-          when '??'
-            operator = BinaryOperator.new(sign, :right, 110)
-          when '?:'
-            operator = BinaryOperator.new(sign, :right, 100)
-          when '=', '*=', '/=', '%=', '+=', '-=', '<<=', '>>=', '&=', '^=', '|=', '&&=', '||='
-            operator = BinaryOperator.new(sign, :right, 90)
-          else
-            raise Exception, 'sign not managed'
+        when '<<', '>>'
+          operator = BinaryOperator.new(sign, :none, 160)
+        when '*', '/', '%', '&*', '&/', '&%', '&'
+          operator = BinaryOperator.new(sign, :left, 150)
+        when '+', '-', '&+', '&-', '|', '^'
+          operator = BinaryOperator.new(sign, :left, 140)
+        when '..<', '...'
+          operator = BinaryOperator.new(sign, :none, 135)
+        when 'is', 'as'
+          operator = BinaryOperator.new(sign, :none, 132)
+        when '<', '<=', '>', '>=', '==', '!=', '===', '!==', '~='
+          operator = BinaryOperator.new(sign, :left, 130)
+        when '&&'
+          operator = BinaryOperator.new(sign, :left, 120)
+        when '||'
+          operator = BinaryOperator.new(sign, :left, 110)
+        when '??'
+          operator = BinaryOperator.new(sign, :right, 110)
+        when '?:'
+          operator = BinaryOperator.new(sign, :right, 100)
+        when '=', '*=', '/=', '%=', '+=', '-=', '<<=', '>>=', '&=', '^=', '|=', '&&=', '||='
+          operator = BinaryOperator.new(sign, :right, 90)
+        else
+          fail "sign #{sign} not managed"
         end
 
         operator
       end
 
-      def self.is_operator(sign)
+      def self.operator?(sign)
         begin
           self.get(sign)
           is_operator = true
-        rescue Exception
+        rescue StandardError
           is_operator = false
         end
 

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

@@ -1,4 +1,4 @@
-module Kauri
+module Jievro
   grammar CodeBlock
 
     rule code_block

data/lib/jievro/parser/grammar/declaration/constant_declaration.treetop

@@ -1,17 +1,12 @@
-module Kauri
+module Jievro
   grammar ConstantDeclaration
 
     rule constant_declaration
       'let' whitespaces:whitespaces pattern_initializer_list:pattern_initializer_list {
         def tokens
-
           tokens = []
 
-          tokens.push({
-            type: 'T_LET',
-            value: 'let'
-          })
-
+          tokens.push(T_LET)
           tokens.concat(whitespaces.tokens)
           tokens.concat(pattern_initializer_list.tokens)
 
@@ -19,7 +14,6 @@ module Kauri
         end
 
         def ast
-
           ast = []
 
           pattern_initializer_list.ast.each { |e|

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

@@ -1,16 +1,58 @@
 require 'jievro/parser/grammar/declaration/constant_declaration'
 require 'jievro/parser/grammar/declaration/variable_declaration'
 require 'jievro/parser/grammar/declaration/function_declaration'
+require 'jievro/parser/grammar/declaration/struct_declaration'
+require 'jievro/parser/grammar/declaration/protocol_declaration'
+require 'jievro/parser/grammar/declaration/initializer_declaration'
+require 'jievro/parser/grammar/declaration/typealias_declaration'
 
-module Kauri
+module Jievro
   grammar Declaration
 
-    include Kauri::ConstantDeclaration
-    include Kauri::VariableDeclaration
-    include Kauri::FunctionDeclaration
+    include Jievro::ConstantDeclaration
+    include Jievro::VariableDeclaration
+    include Jievro::FunctionDeclaration
+    include Jievro::StructDeclaration
+    include Jievro::ProtocolDeclaration
+    include Jievro::InitializerDeclaration
+    include Jievro::TypealiasDeclaration
 
     rule declaration
-      constant_declaration / variable_declaration / function_declaration
+      constant_declaration
+      /
+      variable_declaration
+      /
+      function_declaration
+      /
+      struct_declaration
+      /
+      protocol_declaration
+      /
+      typealias_declaration
+    end
+
+    rule declarations
+      declaration+ {
+        def tokens
+          tokens = []
+
+          elements.each { |e|
+            tokens.concat(e.tokens)
+          }
+
+          tokens
+        end
+
+        def ast
+          ast = []
+
+          elements.each { |e|
+            ast.concat(e.ast)
+          }
+
+          ast
+        end
+      }
     end
   end
 end

data/lib/jievro/parser/grammar/declaration/function_declaration.treetop

@@ -1,4 +1,4 @@
-module Kauri
+module Jievro
   grammar FunctionDeclaration
 
     rule function_declaration
@@ -7,30 +7,17 @@ module Kauri
           tokens = []
 
           tokens.concat(function_head.tokens)
-
-          unless ws1.text_value.empty?
-            tokens.concat(ws1.tokens)
-          end
-
+          tokens.concat(ws1.tokens) unless ws1.text_value.empty?
           tokens.concat(function_name.tokens)
-
-          unless ws2.text_value.empty?
-            tokens.concat(ws2.tokens)
-          end
-
+          tokens.concat(ws2.tokens) unless ws2.text_value.empty?
           tokens.concat(function_signature.tokens)
-
-          unless ws3.text_value.empty?
-            tokens.concat(ws3.tokens)
-          end
-
+          tokens.concat(ws3.tokens) unless ws3.text_value.empty?
           tokens.concat(function_body.tokens)
 
           tokens
         end
 
         def ast
-
           signature = function_signature.ast
 
           name = function_name.ast.first
@@ -54,12 +41,7 @@ module Kauri
     rule function_head
       'func' {
         def tokens
-          [
-            {
-              type: 'T_FUNCTION',
-              value: 'func'
-            }
-          ]
+          [T_FUNCTION]
         end
       }
     end
@@ -74,25 +56,15 @@ module Kauri
           tokens = []
 
           tokens.concat(parameter_clause.tokens)
-
-          unless ws.text_value.empty?
-            tokens.concat(ws.tokens)
-          end
-
-          unless return_type.text_value.empty?
-            tokens.concat(return_type.tokens)
-          end
+          tokens.concat(ws.tokens) unless ws.text_value.empty?
+          tokens.concat(return_type.tokens) unless return_type.text_value.empty?
 
           tokens
         end
         
         def ast
-
           parameters = parameter_clause.ast
-
-          unless return_type.text_value.empty?
-            type = return_type.ast
-          end
+          type = return_type.ast unless return_type.text_value.empty?
 
           {
             parameters: parameters,
@@ -111,19 +83,9 @@ module Kauri
         def tokens
           tokens = []
 
-          tokens.push({
-            type: 'T_OPEN_ROUND_BRACKET',
-            value: '('
-          })
-
-          unless ws.text_value.empty?
-            tokens.concat(ws.tokens)
-          end
-
-          tokens.push({
-            type: 'T_CLOSE_ROUND_BRACKET',
-            value: ')'
-          })
+          tokens.push(T_OPEN_ROUND_BRACKET)
+          tokens.concat(ws.tokens) unless ws.text_value.empty?
+          tokens.push(T_CLOSE_ROUND_BRACKET)
 
           tokens
         end
@@ -139,25 +101,11 @@ module Kauri
         def tokens
           tokens = []
 
-          tokens.push({
-            type: 'T_OPEN_ROUND_BRACKET',
-            value: '('
-          })
-
-          unless ws1.text_value.empty?
-            tokens.concat(ws1.tokens)
-          end
-
+          tokens.push(T_OPEN_ROUND_BRACKET)
+          tokens.concat(ws1.tokens) unless ws1.text_value.empty?
           tokens.concat(parameter_list.tokens)
-
-          unless ws2.text_value.empty?
-            tokens.concat(ws2.tokens)
-          end
-
-          tokens.push({
-            type: 'T_CLOSE_ROUND_BRACKET',
-            value: ')'
-          })
+          tokens.concat(ws2.tokens) unless ws2.text_value.empty?
+          tokens.push(T_CLOSE_ROUND_BRACKET)
 
           tokens
         end
@@ -176,19 +124,9 @@ module Kauri
           unless head.text_value.empty?
             head.elements.each { |e|
               tokens.concat(e.parameter.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?
             }
           end
 
@@ -222,35 +160,25 @@ module Kauri
         def tokens
           tokens = []
 
-          if defined? external_parameter_name
-            tokens.concat(external_parameter_name.tokens)
-          end
+          tokens.concat(external_parameter_name.tokens) \
+            if defined? external_parameter_name
 
           if defined? ws1
-            unless ws1.text_value.empty?
-              tokens.concat(ws1.tokens)
-            end
+            tokens.concat(ws1.tokens) unless ws1.text_value.empty?
           end
 
           tokens.concat(local_parameter_name.tokens)
-
-          unless ws2.text_value.empty?
-            tokens.concat(ws2.tokens)
-          end
-
+          tokens.concat(ws2.tokens) unless ws2.text_value.empty?
           tokens.concat(type_annotation.tokens)
 
           tokens
         end
 
         def ast
-
           type = type_annotation.ast.first
           local = local_parameter_name.ast.first
-
-          if defined? external_parameter_name
-            external = external_parameter_name.ast.first
-          end
+          external = external_parameter_name.ast.first \
+            if defined? external_parameter_name
 
           {
             __type: 'function-declaration-parameter',
@@ -276,15 +204,8 @@ module Kauri
         def tokens
           tokens = []
 
-          tokens.push({
-            type: 'T_RETURN_TYPE_ARROW',
-            value: '->'
-          })
-
-          unless ws.text_value.empty?
-            tokens.concat(ws.tokens)
-          end
-
+          tokens.push(T_RETURN_TYPE_ARROW)
+          tokens.concat(ws.tokens) unless ws.text_value.empty?
           tokens.concat(type.tokens)
 
           tokens