jievro-parser 0.8.0 → 0.9.0

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

@@ -1,8 +1,7 @@
-module Kauri
+module Jievro
   module Tools
     class QuoteStripper
       def strip(string)
-
         string.gsub!(/\\n/, "\n")
         string.gsub!(/\\r/, "\r")
         string.gsub!(/\\t/, "\t")

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

@@ -4,76 +4,62 @@ module Jievro
   module Parser
     module Tools
       class ShuntingYard
-
         def generate_ast(infix_tokens)
-
           node_stack = []
           rpn_tokens = generate_rpn(infix_tokens)
 
-          rpn_tokens.each { |token|
-
-            if BinaryOperator.is_operator(token)
+          rpn_tokens.each do |token|
+            if BinaryOperator.operator?(token)
               right = node_stack.pop
               left = node_stack.pop
 
-              node_stack.push({
+              node_stack << {
                 __type: 'binary-expression',
                 operator: token,
                 left: left,
                 right: right
-              })
-
+              }
             else
-              node_stack.push(token)
+              node_stack << token
             end
-          }
+          end
 
           node_stack
         end
 
         def generate_rpn(infix_tokens)
-
           output_queue = []
           operator_stack = []
 
-          infix_tokens.each { |token|
-
-            if BinaryOperator.is_operator(token)
-
+          infix_tokens.each do |token|
+            if BinaryOperator.operator?(token)
               current_operator = BinaryOperator.get(token)
 
-              until operator_stack.empty? do
-
+              until operator_stack.empty?
                 stack_operator = operator_stack.last
-
                 move_operator_to_queue = false
 
-                if :left == current_operator.associativity and current_operator.precedence <= stack_operator.precedence
+                if :left == current_operator.associativity && current_operator.precedence <= stack_operator.precedence
                   move_operator_to_queue = true
-                elsif :right == current_operator.associativity and current_operator.precedence < stack_operator.precedence
+                elsif :right == current_operator.associativity && current_operator.precedence < stack_operator.precedence
                   move_operator_to_queue = true
                 end
 
-                unless move_operator_to_queue
-                  break
-                end
+                break unless move_operator_to_queue
 
                 operator_stack.pop
-                output_queue.push stack_operator.sign
+
+                output_queue << stack_operator.sign
               end
 
-              operator_stack.push(current_operator)
+              operator_stack << current_operator
             else
-
-              output_queue.push(token)
-
+              output_queue << token
             end
-          }
-
-          until operator_stack.empty?
-            output_queue.push(operator_stack.pop.sign)
           end
 
+          output_queue << operator_stack.pop.sign until operator_stack.empty?
+
           output_queue
         end
       end

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

@@ -30,6 +30,16 @@ T_CLOSE_ROUND_BRACKET = {
   value: ')'
 }
 
+T_OPEN_SQUARE_BRACKET = {
+  type: 'T_OPEN_SQUARE_BRACKET',
+  value: '['
+}
+
+T_CLOSE_SQUARE_BRACKET = {
+  type: 'T_CLOSE_SQUARE_BRACKET',
+  value: ']'
+}
+
 T_OPEN_CURLY_BRACKET = {
   type: 'T_OPEN_CURLY_BRACKET',
   value: '{'
@@ -40,6 +50,43 @@ T_CLOSE_CURLY_BRACKET = {
   value: '}'
 }
 
+T_OPEN_ANGLE_BRACKET = {
+  type: 'T_OPEN_ANGLE_BRACKET',
+  value: '<'
+}
+
+T_CLOSE_ANGLE_BRACKET = {
+  type: 'T_CLOSE_ANGLE_BRACKET',
+  value: '>'
+}
+
+T_QUOTED_EXPRESSION_OPEN = {
+  type: 'T_QUOTED_EXPRESSION_OPEN',
+  value: '\('
+}
+
+T_QUOTED_EXPRESSION_CLOSE = {
+  type: 'T_QUOTED_EXPRESSION_CLOSE',
+  value: ')'
+}
+
+def T_UNICODE_CHAR(value)
+  {
+    type: 'T_UNICODE_CHAR',
+    value: value
+  }
+end
+
+T_QUOTED_UNICODE_CHAR_OPEN = {
+  type: 'T_QUOTED_UNICODE_CHAR_OPEN',
+  value: '\\u' + 123.chr
+}
+
+T_QUOTED_UNICODE_CHAR_CLOSE = {
+  type: 'T_QUOTED_UNICODE_CHAR_CLOSE',
+  value: 125.chr
+}
+
 T_FALSE = {
   type: 'T_FALSE',
   value: 'false'
@@ -62,6 +109,48 @@ def T_LITERAL_INTEGER_DECIMAL(value)
   }
 end
 
+def T_LITERAL_FLOATING_POINT_DECIMAL(value)
+  {
+    type: 'T_LITERAL_FLOATING_POINT_DECIMAL',
+    value: value
+  }
+end
+
+def T_LITERAL_FLOATING_POINT_HEXADECIMAL(value)
+  {
+    type: 'T_LITERAL_FLOATING_POINT_HEXADECIMAL',
+    value: value
+  }
+end
+
+def T_LITERAL_INTEGER_BINARY(value)
+  {
+    type: 'T_LITERAL_INTEGER_BINARY',
+    value: value
+  }
+end
+
+def T_LITERAL_INTEGER_HEXADECIMAL(value)
+  {
+    type: 'T_LITERAL_INTEGER_HEXADECIMAL',
+    value: value
+  }
+end
+
+def T_LITERAL_INTEGER_OCTAL(value)
+  {
+    type: 'T_LITERAL_INTEGER_OCTAL',
+    value: value
+  }
+end
+
+def T_LITERAL_STRING(value)
+  {
+    type: 'T_LITERAL_STRING',
+    value: value
+  }
+end
+
 def T_IDENTIFIER(value)
   {
     type: 'T_IDENTIFIER',
@@ -81,6 +170,11 @@ T_VAR = {
   value: 'var'
 }
 
+T_LET = {
+  type: 'T_LET',
+  value: 'let'
+}
+
 T_FOR = {
   type: 'T_FOR',
   value: 'for'
@@ -110,3 +204,68 @@ T_ELSE = {
   type: 'T_ELSE',
   value: 'else'
 }
+
+T_STRUCT = {
+  type: 'T_STRUCT',
+  value: 'struct'
+}
+
+T_NIL = {
+  type: 'T_NIL',
+  value: 'nil'
+}
+
+T_SELF = {
+  type: 'T_SELF',
+  value: 'self'
+}
+
+T_SUPER = {
+  type: 'T_SUPER',
+  value: 'super'
+}
+
+T_DOUBLE_QUOTE = {
+  type: 'T_DOUBLE_QUOTE',
+  value: '"'
+}
+
+T_FUNCTION = {
+  type: 'T_FUNCTION',
+  value: 'func'
+}
+
+T_RETURN_TYPE_ARROW = {
+  type: 'T_RETURN_TYPE_ARROW',
+  value: '->'
+}
+
+T_PROTOCOL = {
+  type: 'T_PROTOCOL',
+  value: 'protocol'
+}
+
+T_GET = {
+  type: 'T_GET',
+  value: 'get'
+}
+
+T_SET = {
+  type: 'T_SET',
+  value: 'set'
+}
+
+T_INIT = {
+  type: 'T_INIT',
+  value: 'init'
+}
+
+T_TYPEALIAS = {
+  type: 'T_TYPEALIAS',
+  value: 'typealias'
+}
+
+T_UNOWNED = {
+  type: 'T_UNOWNED',
+  value: 'unowned'
+}

data/lib/jievro/parser/version.rb

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

metadata

@@ -1,83 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: jievro-parser
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Stefano Azzalini
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-08 00:00:00.000000000 Z
+date: 2015-06-07 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'
+        version: '0.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.7'
 - !ruby/object:Gem::Dependency
   name: treetop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.9'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.2'
 description: 
@@ -86,8 +86,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -100,6 +100,10 @@ files:
 - lib/jievro/parser/grammar/declaration/constant_declaration.treetop
 - lib/jievro/parser/grammar/declaration/declaration.treetop
 - lib/jievro/parser/grammar/declaration/function_declaration.treetop
+- lib/jievro/parser/grammar/declaration/initializer_declaration.treetop
+- lib/jievro/parser/grammar/declaration/protocol_declaration.treetop
+- lib/jievro/parser/grammar/declaration/struct_declaration.treetop
+- lib/jievro/parser/grammar/declaration/typealias_declaration.treetop
 - lib/jievro/parser/grammar/declaration/variable_declaration.treetop
 - lib/jievro/parser/grammar/expression/binary_expression.treetop
 - lib/jievro/parser/grammar/expression/closure_expression.treetop
@@ -150,6 +154,7 @@ files:
 - lib/jievro/parser/grammar/type/type_array.treetop
 - lib/jievro/parser/grammar/type/type_dictionary.treetop
 - lib/jievro/parser/grammar/type/type_identifier.treetop
+- lib/jievro/parser/grammar/type/type_inheritance_clause.treetop
 - lib/jievro/parser/grammar/whitespace.treetop
 - lib/jievro/parser/grammar/wildcard.treetop
 - lib/jievro/parser/parse_result.rb
@@ -175,17 +180,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ~>
+  - - "~>"
     - !ruby/object:Gem::Version
       version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Source code parser used internally by jievro