hotcell 0.1.0 → 0.2.0

data/lib/hotcell/lexerr.rl

@@ -1,5 +1,4 @@
 %%{
-  #%
   machine puffer_lexer;
 
   variable data @data;
@@ -7,98 +6,15 @@
   variable ts @ts;
   variable p @p;
 
-  plus = '+';
-  minus = '-';
-  multiply = '*';
-  power = '**';
-  divide = '/';
-  modulo = '%';
-  arithmetic = plus | minus | multiply | power | divide | modulo;
+  action RegexpCheck {
+    if (!regexp_possible)
+      emit_operator;
+      fgoto expression;
+    end
+  }
 
-  and = '&&';
-  or = '||';
-  not = '!';
-  equal = '==';
-  inequal = '!=';
-  gt = '>';
-  gte = '>=';
-  lt = '<';
-  lte = '<=';
-  logic = and | or | not | equal | inequal | gt | gte | lt | lte;
-
-  assign = '=';
-  comma = ',';
-  period = '.';
-  colon = ':';
-  question = '?';
-  semicolon = ';';
-  newline = '\n';
-  flow = assign | comma | period | colon | question | semicolon | newline;
-
-  array_open = '[';
-  array_close = ']';
-  hash_open = '{';
-  hash_close = '}';
-  bracket_open = '(';
-  bracket_close = ')';
-  structure = array_open | array_close | hash_open | hash_close | bracket_open | bracket_close;
-
-
-  escaped_symbol = '\\' any;
-
-  squote = "'";
-  snon_quote = [^\\'];
-  sstring = squote (snon_quote | escaped_symbol)* squote @lerr{ raise_unterminated_string(); };
-
-  dquote = '"';
-  dnon_quote = [^\\"];
-  dstring = dquote (dnon_quote | escaped_symbol)* dquote @lerr{ raise_unterminated_string(); };
-
-  rquote = '/';
-  rnon_quote = [^\\/];
-  regexp = rquote @{ regexp_ambiguity { fgoto expression; } }
-    (rnon_quote | escaped_symbol)* rquote alpha* @lerr{ raise_unterminated_regexp(); };
-
-
-  numeric = '-'? digit* ('.' digit+)?;
-  identifer = (alpha | '_') (alnum | '_')* [?!]?;
-  operator = arithmetic | logic | flow | structure;
-  comment = '#' ([^\n}]+ | '}' [^}])*;
-  blank = [\t\v\f\r ];
-
-  tag_open = '{{' '!'?;
-  tag_close = '}}';
-  template = [^{]+ | '{';
-
-  template_comment_open = '{{#';
-  template_comment_close = '#}}';
-  template_comment_body = [^\#]+ | '#';
-
-
-  expression := |*
-    tag_close => { emit_tag(); fret; };
-    operator => { emit_operator(); };
-    numeric => { emit_numeric(); };
-    identifer => { emit_identifer(); };
-    sstring => { emit_sstring(); };
-    dstring => { emit_dstring(); };
-    regexp => { emit_regexp(); };
-    comment => { emit_comment(); };
-    blank;
-  *|;
-
-  template_comment := |*
-    template_comment_close => { emit_comment(); fret; };
-    template_comment_body => { emit_comment(); };
-  *|;
-
-  main := |*
-    tag_open => { emit_tag(); fcall expression; };
-    template_comment_open => { emit_comment(); fcall template_comment; };
-    template => { emit_template(); };
-  *|;
+  include "lexer.rl";
 }%%
-#%
 
 Hotcell::Lexer.class_eval do
   def current_position

data/lib/hotcell/manipulator.rb

@@ -7,7 +7,7 @@ module Hotcell
         class_attribute :manipulator_methods, instance_writter: false
         self.manipulator_methods = Set.new
 
-        def self.manipulator *methods
+        def self.manipulate *methods
           self.manipulator_methods = Set.new(manipulator_methods.to_a + methods.flatten.map(&:to_s))
         end
       end
@@ -17,7 +17,25 @@ module Hotcell
       end
 
       def manipulator_invoke method, *arguments
-        send(method, *arguments) if manipulator_methods.include? method
+        if method == '[]'
+          manipulator_invoke_brackets *arguments
+        elsif manipulator_invokable? method
+          send(method, *arguments)
+        end
+      end
+
+    private
+
+      def manipulator_invokable? method
+        manipulator_methods.include? method
+      end
+
+      def manipulator_invoke_brackets *arguments
+        if respond_to? :[]
+          self[*arguments]
+        else
+          manipulator_invoke *arguments
+        end
       end
     end
 

data/lib/hotcell/node/{calculator.rb → expression.rb}

@@ -1,5 +1,5 @@
 module Hotcell
-  class Calculator < Hotcell::Node
+  class Expression < Hotcell::Node
     HANDLERS = {
       :PLUS => ->(value1, value2) { value1 + value2 },
       :MINUS => ->(value1, value2) { value1 - value2 },
@@ -17,7 +17,9 @@ module Hotcell
       :GT => ->(value1, value2) { value1 > value2 },
       :GTE => ->(value1, value2) { value1 >= value2 },
       :LT => ->(value1, value2) { value1 < value2 },
-      :LTE => ->(value1, value2) { value1 <= value2 }
+      :LTE => ->(value1, value2) { value1 <= value2 },
+      :RANGE => ->(value1, value2) { Range.new value1, value2 },
+      :ERANGE => ->(value1, value2) { Range.new value1, value2, true }
     }
 
     def optimize

data/lib/hotcell/node/tag.rb

@@ -19,10 +19,12 @@ module Hotcell
 
     def concat context, result
       case mode
-      when :normal
-        result
-      else
+      when :silence
         ''
+      when :escape
+        ERB::Util.html_escape_once(result)
+      else
+        result.to_s
       end
     end
   end

data/lib/hotcell/node.rb

@@ -54,7 +54,7 @@ module Hotcell
   end
 end
 
-require 'hotcell/node/calculator'
+require 'hotcell/node/expression'
 require 'hotcell/node/assigner'
 require 'hotcell/node/summoner'
 require 'hotcell/node/arrayer'