jievro-parser 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9265ff73d1bf35da428218e5880fadd8db1742d4
-  data.tar.gz: aac8b8c5d9b50f766ab0a0f91f1a633753ab3dc8
+  metadata.gz: d56703e726b140d5f670a4612faebbfbf231ec1f
+  data.tar.gz: 83a92536b8ee7c04845ba217a70f464258328da6
 SHA512:
-  metadata.gz: 2783011135c322c5d83a8b6c5e796705e296c665b7233758c4bb06708a3e97ab8c8ae9fe3df82a5f68859b17e4610a0755103129c4be6963fb8d8b8c7c80ea0f
-  data.tar.gz: 9ea99720dd29d55207ef5f74f146f9e0de39ea8195b8e552eed504de979e4e88a676c132884bea17d0f19713814aaaf455b4fc6e97969d679ebfb3af32c7ea82
+  metadata.gz: 13370ace3ab61ee7218449f6a74e1529cda2b89a00b0c1374f4c23c215a53c4062d4c42fbed6f9006a52d9e6b24f110aca5381dba9ae45f3cd483cbdbcf143b8
+  data.tar.gz: b990775579e54f24dac0144200f23d92b682ec0778e819a65463d8456eb88008a7644c30c51f41d13e24884e713995b8653142d44317f0177fc85499408f0f0e

data/.travis.yml

@@ -1,3 +1,7 @@
 language: ruby
+rvm:
+  - 2.0.0
+  - 2.1.0
+  - 2.2.0
 
 script: bundle exec rake test

data/Gemfile.lock

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

data/Rakefile

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

data/jievro-parser.gemspec

@@ -18,6 +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 'treetop', '~> 1.6'
 
   spec.add_development_dependency 'bundler', '~> 1.9'

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

@@ -24,7 +24,7 @@ module Kauri
 
           pattern_initializer_list.ast.each { |e|
             ast.push({
-              node_type: 'constant-declaration',
+              __type: 'constant-declaration',
               pattern: e[:pattern],
               initializer: e[:initializer]
             })

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

@@ -40,7 +40,7 @@ module Kauri
 
           [
             {
-              node_type: 'function-declaration',
+              __type: 'function-declaration',
               name: name,
               parameters: parameters,
               return_type: return_type,
@@ -253,6 +253,7 @@ module Kauri
           end
 
           {
+            __type: 'function-declaration-parameter',
             type: type,
             local: local,
             external: external,

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

@@ -24,7 +24,7 @@ module Kauri
 
           pattern_initializer_list.ast.each { |e|
             ast.push({
-              node_type: 'variable-declaration',
+              __type: 'variable-declaration',
               pattern: e[:pattern],
               initializer: e[:initializer]
             })

data/lib/jievro/parser/grammar/expression/closure_expression.treetop

@@ -40,7 +40,7 @@ module Kauri
         def ast
 
           ast = {
-            node_type: 'closure-expression',
+            __type: 'closure-expression',
             body: statement_list.ast
           }
 
@@ -111,7 +111,9 @@ module Kauri
 
         def ast
           {
+            __type: 'closure-expression-signature',
             capture: {
+              __type: 'closure-expression-capture-specifier',
               specifier: capture_specifier.ast,
               expression: expression.ast.first
             }

data/lib/jievro/parser/grammar/expression/function_call_expression.treetop

@@ -20,7 +20,7 @@ module Kauri
         def ast
           [
             {
-              node_type: 'function-call-expression',
+              __type: 'function-call-expression',
               callee: callee.ast.first,
               parameters: parameters.ast
             }

data/lib/jievro/parser/grammar/expression/parenthesized_expression.treetop

@@ -134,7 +134,7 @@ module Kauri
         def ast
           [
             {
-              node_type: 'expression-element',
+              __type: 'expression-element',
               identifier: identifier.ast.first,
               expression: expression.ast.first
             }

data/lib/jievro/parser/grammar/expression/prefix_expression.treetop

@@ -13,7 +13,7 @@ module Kauri
         def ast
           [
             {
-              node_type: 'prefix-expression',
+              __type: 'prefix-expression',
               operator: operator.operator,
               argument: expression.ast.first
             }

data/lib/jievro/parser/grammar/expression/range_expression.treetop

@@ -27,7 +27,7 @@ module Kauri
         def ast
           [
             {
-              node_type: 'binary-expression',
+              __type: 'binary-expression',
               operator: range_operator.text_value,
               left: left.ast.first,
               right: right.ast.first

data/lib/jievro/parser/grammar/expression/self_expression.treetop

@@ -15,7 +15,7 @@ module Kauri
         def ast
           [
             {
-              node_type: 'self-expression'
+              __type: 'self-expression'
             }
           ]
         end

data/lib/jievro/parser/grammar/expression/super_expression.treetop

@@ -15,7 +15,7 @@ module Kauri
         def ast
           [
             {
-              node_type: 'super-expression'
+              __type: 'super-expression'
             }
           ]
         end

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

@@ -61,7 +61,7 @@ module Jievro
             end
 
             {
-              node_type: 'program',
+              __type: 'program',
               body: body
             }
           end

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

@@ -23,7 +23,7 @@ module Kauri
         def ast
           [
             {
-              node_type: 'identifier',
+              __type: 'identifier',
               value: text_value
             }
           ]
@@ -45,7 +45,7 @@ module Kauri
         def ast
           [
             {
-              node_type: 'identifier',
+              __type: 'identifier',
               value: regular_identifier.text_value
             }
           ]

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

@@ -15,7 +15,7 @@ module Kauri
         def ast
           [
             {
-              node_type: 'implicit-parameter-name',
+              __type: 'implicit-parameter-name',
               value: literal_integer_decimal.text_value,
             }
           ]

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

@@ -41,7 +41,7 @@ module Kauri
 
           [
             {
-              node_type: 'literal-array',
+              __type: 'literal-array',
               values: values
             }
           ]

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

@@ -18,7 +18,7 @@ module Kauri
         def ast
           [
             {
-              node_type: 'literal-boolean',
+              __type: 'literal-boolean',
               value: true
             }
           ]
@@ -39,7 +39,7 @@ module Kauri
         def ast
           [
             {
-              node_type: 'literal-boolean',
+              __type: 'literal-boolean',
               value: false
             }
           ]

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

@@ -26,7 +26,7 @@ module Kauri
 
           [
             {
-              node_type: 'literal-double',
+              __type: 'literal-double',
               value: converter.convert(text_value)
             }
           ]

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

@@ -57,7 +57,7 @@ module Kauri
             ast = items.ast
           else
             ast = [{
-              node_type: 'literal-dictionary',
+              __type: 'literal-dictionary',
               pairs: []
             }]
           end
@@ -95,6 +95,7 @@ module Kauri
         def ast
           [
             {
+              __type: 'literal-dictionary-pair',
               key: key.ast.first,
               value: value.ast.first
             }
@@ -146,7 +147,7 @@ module Kauri
 
           [
             {
-              node_type: 'literal-dictionary',
+              __type: 'literal-dictionary',
               pairs: pairs
             }
           ]

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

@@ -24,7 +24,7 @@ module Kauri
 
           [
             {
-              node_type: 'literal-double',
+              __type: 'literal-double',
               value: converter.convert(text_value)
             }
           ]

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

@@ -20,7 +20,7 @@ module Kauri
 
           [
             {
-              node_type: 'literal-integer',
+              __type: 'literal-integer',
               value: converter.convert(text_value)
             }
           ]

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

@@ -20,7 +20,7 @@ module Kauri
 
           [
             {
-              node_type: 'literal-integer',
+              __type: 'literal-integer',
               value: converter.convert(text_value)
             }
           ]

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

@@ -20,7 +20,7 @@ module Kauri
 
           [
             {
-              node_type: 'literal-integer',
+              __type: 'literal-integer',
               value: converter.convert(text_value)
             }
           ]

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

@@ -20,7 +20,7 @@ module Kauri
 
           [
             {
-              node_type: 'literal-integer',
+              __type: 'literal-integer',
               value: converter.convert(text_value)
             }
           ]

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

@@ -15,7 +15,7 @@ module Kauri
         def ast
           [
             {
-              node_type: 'literal-nil'
+              __type: 'literal-nil'
             }
           ]
         end

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

@@ -29,7 +29,7 @@ module Kauri
           if quoted_text.text_value.empty?
             ast = [
               {
-                node_type: 'literal-string',
+                __type: 'literal-string',
                 value: ''
               }
             ]
@@ -75,7 +75,7 @@ module Kauri
                 ast[-1][:value] += value
               else
                 ast.push({
-                  node_type: 'literal-string',
+                  __type: 'literal-string',
                   value: value
                 })
               end
@@ -86,7 +86,7 @@ module Kauri
           if is_interpolated_string
             ast = [
               {
-                node_type: 'interpolated-string',
+                __type: 'interpolated-string',
                 value: ast
               }
             ]

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

@@ -20,7 +20,7 @@ module Kauri
         def ast
 
           ast = {
-            node_type: 'if-statement',
+            __type: 'if-statement',
             condition: condition.ast.first,
             body: body.ast
           }

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

@@ -20,7 +20,7 @@ module Kauri
         def ast
           [
             {
-              node_type: 'do-while-statement',
+              __type: 'do-while-statement',
               body: body.ast,
               test: test.ast.first
             }

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

@@ -25,7 +25,7 @@ module Kauri
           body = for_body.ast
 
           ast = {
-            node_type: 'for-statement',
+            __type: 'for-statement',
             init: init
           }
 

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

@@ -22,7 +22,7 @@ module Kauri
         def ast
           [
             {
-              node_type: 'for-in-statement',
+              __type: 'for-in-statement',
               iterator: iterator.ast.first,
               collection: collection.ast.first,
               body: body.ast

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

@@ -18,7 +18,7 @@ module Kauri
         def ast
           [
             {
-              node_type: 'while-statement',
+              __type: 'while-statement',
               condition: condition.ast.first,
               body: body.ast
             }

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

@@ -32,7 +32,7 @@ module Kauri
         def ast
           [
             {
-              node_type: 'array',
+              __type: 'array',
               type: type.ast.first
             }
           ]

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

@@ -47,7 +47,7 @@ module Kauri
         def ast
           [
             {
-              node_type: 'dictionary',
+              __type: 'dictionary',
               key_type: key_type.ast.first,
               value_type: value_type.ast.first
             }

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

@@ -15,7 +15,7 @@ module Kauri
         def ast
           [
             {
-              node_type: 'wildcard'
+              __type: 'wildcard'
             }
           ]
         end

data/lib/jievro/parser/parse_result.rb

@@ -1,18 +1,12 @@
 module Jievro
   module Parser
-  class ParseResult
+    class ParseResult
+      attr_reader :tokens, :ast
+
       def initialize(tokens, ast)
         @tokens = tokens
         @ast = ast
       end
-
-      def tokens
-        @tokens
-      end
-
-      def ast
-        @ast
-      end
     end
   end
 end

data/lib/jievro/parser/string_parser.rb

@@ -2,6 +2,7 @@ require 'treetop'
 require 'polyglot'
 require 'jievro/parser/grammar/grammar'
 require 'jievro/parser/parse_result'
+require 'jievro/ast/node'
 
 module Jievro
   module Parser
@@ -12,7 +13,7 @@ module Jievro
 
         tokens = []
         ast = {
-          node_type: 'program',
+          __type: 'program',
           body: []
         }
 
@@ -28,7 +29,7 @@ module Jievro
           ast = parsed.ast
         end
 
-        Jievro::Parser::ParseResult.new(tokens, ast)
+        Jievro::Parser::ParseResult.new(tokens, Jievro::Ast::Node.new(ast))
       end
     end
   end

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

@@ -17,7 +17,7 @@ module Jievro
               left = node_stack.pop
 
               node_stack.push({
-                node_type: 'binary-expression',
+                __type: 'binary-expression',
                 operator: token,
                 left: left,
                 right: right

data/lib/jievro/parser/version.rb

@@ -1,5 +1,5 @@
 module Jievro
   module Parser
-    VERSION = '0.7.0'
+    VERSION = '0.8.0'
   end
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: jievro-parser
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Stefano Azzalini
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-06 00:00:00.000000000 Z
+date: 2015-05-08 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: jievro-ast
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.5'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: treetop
   requirement: !ruby/object:Gem::Requirement