antelope 0.1.11 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e756559116af74788e49931a9ad0dd6c854e7b54
-  data.tar.gz: 8197695fe868552cea974c23745a1691429cc49b
+  metadata.gz: 516fa3871c9dac6ede9010e5dce27e6427e54c0a
+  data.tar.gz: 05950417e688f1e91bd72533a6fba22e5b4f0c39
 SHA512:
-  metadata.gz: 96a4da9fa6114fc0eaf54da4cc8e8476c915ff309e5814b2d21dc6a5ef6b242ee44f5788cbc930030279e549c8b5796f7357cc08b99a569198da96cc79cabd58
-  data.tar.gz: 2f9cc8c84095e049b4dfbf26f5ed851bca8f835e4fe2b2b2e1d1c90473f37eae05d963d72280fadb7abc38c73992e4d5a58e4d42560d5358a6de9f4a3cc46ba5
+  metadata.gz: 5f798c4757105920b7b552891c481587654bbbf3df69fb0ab5eff2e0c6a927ddf6b5f746fa548bdf71970aebda029c249e0d1ea82d418dc88d22d6c4b378f7a1
+  data.tar.gz: 1a800f78ea7ba51e36a3d4e24bd905dd49b7f7b37bc4eccebbc6872230d44653252b4b288b6988e6c3470e37face35e89ffb427e7d6e73553b221c1e4cc419be

data/examples/liquidscript.ace

@@ -0,0 +1,162 @@
+%require "~> 0.1"
+%generator "ruby"
+
+%define api.push-pull pull
+%define panic-mode true
+%define ruby.error-class {SyntaxError}
+
+%terminal REGEX
+%terminal DIRECTIVE
+%terminal IDENTIFIER
+%terminal KEYWORD
+%terminal NUMBER
+%terminal SSTRING
+%terminal ACTION
+%terminal BINOP
+%terminal PREUNOP
+%terminal UNOP
+%terminal HEREDOC
+%terminal HEREDOC_REF
+%terminal IHEREDOC
+%terminal IHEREDOC_REF
+%terminal IHEREDOC_BEGIN
+%terminal ISTRING
+%terminal ISTRING_BEGIN
+%terminal CLASS "class"
+%terminal MODULE "module"
+%terminal IF "if"
+%terminal UNLESS "unless"
+%terminal ELSIF "elsif"
+%terminal ELSE "else"
+%terminal FOR "for"
+%terminal WHILE "while"
+%terminal TRY "try"
+%terminal CATCH "catch"
+%terminal FINALLY "finally"
+%terminal RETURN "return"
+%terminal IN "in"
+%terminal ARROW "->"
+%terminal EQUAL "="
+%terminal LBRACE "{"
+%terminal LPAREN "("
+%terminal LBRACK "["
+%terminal RBRACE "}"
+%terminal RPAREN ")"
+%terminal RBRACK "]"
+%terminal COLON ":"
+%terminal RANGE ".."
+%terminal ERANGE "..."
+%terminal PROP "."
+%terminal COMMA ","
+%terminal MINUS "-"
+%terminal PLUS "+"
+%terminal NEWLINE "\n"
+
+%null.data left LPAREN LBRACK BINOP MINUS PLUS
+%null.data right EQUAL PROP RANGE ERANGE UNOP
+
+%%
+
+main: expressions.maybe
+
+expressions.maybe: expressions
+                 | nothing
+
+expressions: expressions block
+           | block
+
+block: LBRACE expressions RBRACE
+     | expression
+
+expression: conditional
+          | class
+          | module
+          | loop
+          | action
+          | exception
+          | directive
+          | vexpression
+
+vexpression: NUMBER
+           | IDENTIFIER
+           | ISTRING
+           | SSTRING
+           | KEYWORD
+           | REGEX
+           | NEWLINE
+           | interpolation
+           | PLUS vexpression
+           | MINUS vexpression
+           | object
+           | array
+           | function
+           | PREUNOP vexpression
+           | UNOP vexpression
+           | HEREDOC_REF
+           | IHEREDOC_REF
+           | heredoc
+           | vexpression LPAREN vexpression.parameters.maybe RPAREN
+           | vexpression EQUAL vexpression
+           | vexpression PROP IDENTIFIER
+           | vexpression LBRACK vexpression RBRACK
+           | vexpression RANGE vexpression
+           | vexpression ERANGE vexpression
+           | vexpression BINOP vexpression
+           | vexpression MINUS vexpression
+           | vexpression PLUS vexpression
+           | vexpression UNOP
+
+vexpression.parameters.maybe: vexpression.parameters
+                            | nothing
+
+vexpression.parameters: vexpression.parameters COMMA vexpression
+                      | vexpression
+
+object: LBRACE RBRACE
+array: LBRACK RBRACK
+function: LPAREN RPAREN ARROW
+heredoc: HEREDOC
+       | IHEREDOC
+
+interpolation: interpolation.string
+             | interpolation.heredoc
+
+interpolation.heredoc: IHEREDOC_BEGIN vexpression interpolation.heredoc.finish
+interpolation.heredoc.finish: interpolation.heredoc
+                            | IHEREDOC
+
+interpolation.string: ISTRING_BEGIN vexpression interpolation.string.finish
+interpolation.string.finish: interpolation.string
+                           | ISTRING
+
+conditional: IF LPAREN vexpression RPAREN block conditional.continue
+  | UNLESS LPAREN vexpression RPAREN block
+
+conditional.continue: ELSIF LPAREN vexpression RPAREN block conditional.continue
+                    | ELSE block
+
+class: CLASS IDENTIFIER RBRACE LBRACE
+module: MODULE IDENTIFIER RBRACE LBRACE
+
+loop: WHILE LPAREN vexpression RPAREN block
+    | FOR LPAREN IDENTIFIER IN vexpression RPAREN block
+    | FOR LPAREN vexpression RPAREN block
+
+action: RETURN
+      | ACTION
+
+exception: TRY block exception.catch.maybe exception.finally.maybe
+exception.catch.maybe: exception.catch
+                     | nothing
+exception.finally.maybe: exception.finally
+                       | nothing
+exception.catch: CATCH exception.catch.possible block
+exception.catch.possible: LPAREN IDENTIFIER RPAREN
+                        | LPAREN RPAREN
+                        | nothing
+
+exception.finally: FINALLY block
+
+directive: COLON LBRACK expressions RBRACK
+
+%%

data/lib/antelope/ace/token.rb

@@ -26,20 +26,20 @@ module Antelope
       # handle lookahead sets.
       #
       # @return [Recognizer::State]
-      attr_accessor :from
+      attr_reader :from
 
       # The to state that this token is transitioned to.  This is the
       # _destination_.  This is used in the constructor in order to
       # handle lookahead sets.
       #
       # @return [Recognizer::State]
-      attr_accessor :to
+      attr_reader :to
 
       # The type of the token.  This is given by a caret argument to
       # the grammar.  This is primarily used for generators.
       #
       # @return [String]
-      attr_accessor :type
+      attr_reader :type
 
       attr_accessor :id
 
@@ -97,6 +97,33 @@ module Antelope
         false
       end
 
+      # Sets the from state of the token and invalidates the cache.
+      #
+      # @param state [Recognizer::State]
+      # @return [void]
+      def from=(state)
+        invalidate_cache!
+        @from = state
+      end
+
+      # Sets the to state of the token and invalidates the cache.
+      #
+      # @param state [Recognizer::State]
+      # @return [void]
+      def to=(state)
+        invalidate_cache!
+        @to = state
+      end
+
+      # Sets the type of the token and invalidates the cache.
+      #
+      # @param type [String]
+      # @return [void]
+      def type=(type)
+        invalidate_cache!
+        @type = type
+      end
+
       # Gives a string representation of the token.  The output is
       # formatted like so: `<data>["(" [<from_id>][:<to_id>] ")"]`,
       # where `<data>` is either the value (if it's non-nil) or the
@@ -149,6 +176,12 @@ module Antelope
         end
       end
 
+      def ==(other)
+        hash == other.hash if other.respond_to?(:hash)
+      end
+
+      alias_method :eql?, :==
+
       # Compares this class and another object, fuzzily.  If the other
       # object is a token, it removes the transitions (to and from)
       # on both objects and compares them like that.  Otherwise, it
@@ -171,6 +204,14 @@ module Antelope
         self.class.new(name, @type, @id, @value)
       end
 
+      # Invalidates the cache.
+      #
+      # @return [void]
+      def invalidate_cache!
+        @_hash = nil
+        @_array = nil
+      end
+
       # Generates a hash for this class.
       #
       # @note This is not intended for use.  It is only defined to be
@@ -178,7 +219,7 @@ module Antelope
       # @private
       # @return [Object]
       def hash
-        to_a.hash
+        @_hash ||= to_a.hash
       end
 
       alias_method :eql?, :==
@@ -190,7 +231,7 @@ module Antelope
       # @private
       # @return [Array<(Recognizer::State, Recognizer::State, Class, Symbol, String?)>]
       def to_a
-        [to, from, self.class, name, @value]
+        @_array ||= [to, from, self.class, name, @value]
       end
     end
   end

data/lib/antelope/generation/recognizer/rule.rb

@@ -19,7 +19,7 @@ module Antelope
         # The right-hand side of the rule.
         #
         # @return [Array<Ace::Token>]
-        attr_accessor :right
+        attr_reader :right
 
         # The current position inside of the rule.
         #
@@ -160,6 +160,12 @@ module Antelope
           end
         end
 
+        def ==(other)
+          hash == other.hash if other.respond_to?(:hash)
+        end
+
+        alias_method :eql?, :==
+
         # Fuzzily compares this object to another object.  If the
         # other object is not a rule, it delegates the comparison.
         # Otherwise, it fuzzily compares the left and right sides.
@@ -192,11 +198,9 @@ module Antelope
         # @private
         # @return [Object]
         def hash
-          to_a.hash
+          @_hash ||= to_a.hash
         end
 
-        alias_method :eql?, :==
-
         # Creates an array representation of this class.
         #
         # @note This is not intended for use.  It is only defined to
@@ -204,7 +208,7 @@ module Antelope
         # @private
         # @return [Array<(Ace::Token::Nonterminal, Array<Ace::Token>, Numeric)>]
         def to_a
-          [left, right, position]
+          @_array ||= [left, right, position]
         end
       end
     end

data/lib/antelope/generation/recognizer/state.rb

@@ -90,13 +90,13 @@ module Antelope
           when State
             rule.rules.map(&:clone).each { |r| self << r }
           when Rule
-            rules << rule unless rules.include? rule
+            rules << rule #unless rules.include? rule
           when Array, Set
             rule.each do |part|
               self << part
             end
           else
-            raise ArgumentError, "Expected #{State} or #{Rule}, " \
+            raise ArgumentError, "Expected State or Rule, " \
               "got #{rule.class}"
           end
 

data/lib/antelope/generation/recognizer.rb

@@ -111,7 +111,7 @@ module Antelope
       end
 
       def compute_gotos(state)
-        actives = state.rules.map(&:active).select(&:name).to_set
+        actives = state.rules.map(&:active).select(&:name)
 
         actives.each do |active|
           next if state.transitions[active.name]

data/lib/antelope/generator.rb

@@ -36,7 +36,8 @@ module Antelope
     # @param name [String, Symbol] a name to associate the generator
     #   with.
     def register_generator(generator, *names)
-      names = [names].flatten      raise ArgumentError,
+      names = [names].flatten
+      raise ArgumentError,
         "Requires at least one name" unless names.any?
       raise ArgumentError,
         "All name values must be a Symbol or string" unless names.

data/lib/antelope/version.rb

@@ -2,5 +2,5 @@
 
 module Antelope
   # The current running version of antelope.
-  VERSION = "0.1.11".freeze
+  VERSION = "0.2.0".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: antelope
 version: !ruby/object:Gem::Version
-  version: 0.1.11
+  version: 0.2.0
 platform: ruby
 authors:
 - Jeremy Rodi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-22 00:00:00.000000000 Z
+date: 2015-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie
@@ -118,6 +118,7 @@ files:
 - examples/deterministic.ace
 - examples/example.ace
 - examples/example.output
+- examples/liquidscript.ace
 - examples/simple.ace
 - lib/antelope.rb
 - lib/antelope/ace.rb
@@ -215,3 +216,4 @@ test_files:
 - spec/spec_helper.rb
 - spec/support/benchmark_helper.rb
 - spec/support/grammar_helper.rb
+has_rdoc: