liquidscript 0.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4f11281d148fb640ffc2e0f7e8620d90db902979
-  data.tar.gz: 8e49e850af07a8d34d44595e2f8d550eb09e5a05
+  metadata.gz: 6fe5335e4dfdf4f906673f081655d77b96fbca14
+  data.tar.gz: 5c1ff4ce91cc20fa3ede9c4fc7dfe030e752fef6
 SHA512:
-  metadata.gz: f7e8ba8419ac72d775682a35fd5f8acea5a8210e20d2279ef508b1008470eb8f737d9226c481bd35f9ce3bfb2f980e9c191cd47e1d86afb56148f5a7ddde1cb4
-  data.tar.gz: 05d976029b24a986e993c40604ea57bd2034bd27dde7aa376e14db6db3a1bfc65e537009fab0bcac41612e44fed250c654a37571924bac12e8f80daa023874e6
+  metadata.gz: 051c175bba208e2cd9154d72722a55d31a2db037a17ed87dc4b8c7e275df81c6ec344fe35bd9f7bbae431b72c9c0f4789e8dfc9d54820a302360b759a92c777b
+  data.tar.gz: 8f4c51719dcc4dfa40856605796694cc3bd00f579eee32fd63056126e86269fcdb302ddc217bcc1643e3191b61159255a904a50381d94f79fb88af3992cea602

data/lib/liquidscript/buffer.rb

@@ -13,8 +13,8 @@ module Liquidscript
       self
     end
 
-    def block(str)
-      append str.gsub(/^[ \t]+/, '')
+    def block(indent, str)
+      append str.gsub(/^[ \t]{#{indent*2}}/, '')
     end
 
     def set_join!(to)

data/lib/liquidscript/compiler/icr.rb

@@ -3,6 +3,7 @@ require "liquidscript/compiler/icr/functions"
 require "liquidscript/compiler/icr/literals"
 require "liquidscript/compiler/icr/classes"
 require "liquidscript/compiler/icr/helpers"
+require "liquidscript/compiler/icr/heredoc"
 
 module Liquidscript
   module Compiler

data/lib/liquidscript/compiler/icr/classes.rb

@@ -6,10 +6,18 @@ module Liquidscript
         def compile_class
           shift :class
           name = shift :identifier
+          inherit = nil
           set name
+          # Inheritance ftw!
+          if peek?(:colon)
+            shift :colon
+            inherit = shift :identifier
+            ref inherit
+          end
+
           body = _compile_class_body(false)
 
-          code :class, name, body
+          code :class, name, inherit, body
         end
 
         def compile_module
@@ -22,7 +30,7 @@ module Liquidscript
         end
 
         def _compile_class_body(mod = false)
-          shift :lbrack
+          shift :lbrace
 
           components = []
 
@@ -34,7 +42,7 @@ module Liquidscript
           end
 
           loop do
-            expect :newline, :rbrack => action.end_loop,
+            expect :newline, :rbrace => action.end_loop,
             :comma         => action.shift,
             :module        => action { components << compile_module },
             :class         => action { components << compile_class  },

data/lib/liquidscript/compiler/icr/expressions.rb

@@ -8,7 +8,8 @@ module Liquidscript
         #
         # @return [ICR::Code]
         def compile_expression
-          expect :if, :unless, :class, :module, :_ => :vexpression
+          expect :if, :unless, :class, :module, :loop, :for,
+                 :while, :action, :try, :_ => :vexpression
         end
 
         # Compiles an expression that returns a value.
@@ -19,11 +20,19 @@ module Liquidscript
                        :istring,    :lparen,
                        :sstring,    :operator,
                        :keyword,    :unop,
+                       :regex,
                        :newline,
                        :istring_begin,
-                       :lbrack   => :object,
-                       :lbrace   => :array,
-                       :arrow    => :function
+                       :iheredoc_begin,
+                       :lbrace   => :object,
+                       :lbrack   => :array,
+                       :arrow    => :function,
+                       [
+                        :heredoc_ref, :iheredoc_ref
+                       ]         => :href,
+                       [
+                        :heredoc, :iheredoc
+                       ]         => :heredoc
 
           if peek? :binop
             compile_binop(out)
@@ -120,9 +129,9 @@ module Liquidscript
             shift :lparen
             conditional = compile_vexpression
             shift :rparen
-            shift :lbrack
+            shift :lbrace
 
-            body = collect_compiles(:expression, :rbrack)
+            body = collect_compiles(:expression, :rbrace)
 
             if peek?(:elsif, :else)
               code key, conditional, body, expect(:elsif, :else)
@@ -137,21 +146,58 @@ module Liquidscript
           shift :lparen
           conditional = compile_vexpression
           shift :rparen
-          shift :lbrack
+          shift :lbrace
 
-          body = collect_compiles(:expression, :rbrack)
+          body = collect_compiles(:expression, :rbrace)
           code :unless, conditional, body
         end
 
         def compile_else
           shift :else
-          shift :lbrack
+          shift :lbrace
 
-          body = collect_compiles(:expression, :rbrack)
+          body = collect_compiles(:expression, :rbrace)
 
           code :else, body
         end
 
+        def compile_try
+          shift :try
+          shift :lbrace
+          try_body = collect_compiles(:expression, :rbrace)
+
+          next_part = if peek?(:catch)
+            _compile_catch
+          elsif peek?(:finally)
+            _compile_finally
+          end
+
+          code :try, try_body, next_part
+        end
+
+        def _compile_catch
+          shift :catch
+          shift :lparen
+          var = shift :identifier
+          shift :rparen
+          shift :lbrace
+          catch_body = collect_compiles(:expression, :rbrace)
+
+          next_part = if peek?(:finally)
+            _compile_finally
+          end
+
+          code :catch, var, catch_body, next_part
+        end
+
+        def _compile_finally
+          shift :finally
+          shift :lbrace
+          finally_body = collect_compiles(:expression, :rbrace)
+
+          code :finally, finally_body
+        end
+
       end
     end
   end

data/lib/liquidscript/compiler/icr/functions.rb

@@ -7,16 +7,17 @@ module Liquidscript
           shift :prop
 
           property = action do |ident|
-            code :property, prop, ident
+            code :property, prop, (ident.value || ident.type)
           end
 
           # Just in case there is a property named 'class' or 'module'
-          code = expect [:identifier, :class, :module] => property
+          v = expect [:identifier, :class, :module] => property
 
-          expect :lparen => action { compile_call(code)       },
-                 :equal  => action { compile_assignment(code) },
-                 :prop   => action { compile_property(code)   },
-                 :_      => action { code                     }
+          expect :lparen => action { compile_call(v)       },
+                 :equal  => action { compile_assignment(v) },
+                 :prop   => action { compile_property(v)   },
+                 :unop   => action { |o| code :op, v, o    },
+                 :_      => action { v                     }
         end
 
         def compile_call(subject)

data/lib/liquidscript/compiler/icr/heredoc.rb

@@ -0,0 +1,28 @@
+module Liquidscript
+  module Compiler
+    class ICR < Base
+      class Heredoc
+
+        attr_reader :name
+        attr_accessor :body
+
+        include Liquidscript::ICR::Representable
+
+        def initialize(name, interpolate)
+          @name        = name
+          @interpolate = interpolate
+          @body        = []
+        end
+
+        def interpolate?
+          !!@interpolate
+        end
+
+        def to_a
+          [:heredoc, @name, @body]
+        end
+
+      end
+    end
+  end
+end

data/lib/liquidscript/compiler/icr/literals.rb

@@ -7,17 +7,110 @@ module Liquidscript
           code :number, pop.value
         end
 
+        def compile_action
+          code :action, shift(:action)
+        end
+
+        def compile_while
+          shift :while
+          shift :lparen
+          conditional = compile_vexpression
+          shift :rparen
+          shift :lbrace
+          body = collect_compiles(:expression, :rbrace)
+          code :while, conditional, body
+        end
+
+        def compile_for
+          shift :for
+          shift :lparen
+          if peek?(:identifier)
+            ident = shift :identifier
+            if peek?(:identifier)
+              _compile_for_in(ident)
+            else
+              _compile_for_seg(compile_identifier(ident))
+            end
+          else
+            compile_for_seg compile_vexpression
+          end
+        end
+
+        def _compile_for_in(ident)
+          content = shift :identifier
+          unless content.value == "in"
+            raise CompileError, "Expected `in', got #{content.value}"
+          end
+
+          obj = shift :identifier
+          shift :rparen
+          shift :lbrace
+
+          set ident
+          body = collect_compiles(:expression, :rbrace)
+          code :for_in, ident, ref(obj), body
+        end
+
+        def _compile_for_seg(first)
+          shift :comma
+          second = compile_vexpression
+          shift :comma
+          third = compile_vexpression
+          shift :rparen
+          shift :lbrace
+
+          body = collect_compiles(:expression, :rbrace)
+          code :for_seg, first, second, third, body
+        end
+
         def compile_identifier(identifier)
           default = action do
             code :get, ref(identifier)
           end
 
-          expect :equal  => action { compile_assignment(identifier) },
-                 :prop   => action { compile_property(identifier)   },
-                 :lparen => action { compile_call(identifier)       },
+          expect :equal  => action { compile_assignment(identifier)   },
+                 :prop   => action { compile_property(identifier)     },
+                 :lparen => action { compile_call(identifier)         },
+                 :unop   => action { |o| code :op, ref(identifier), o },
                  :_      => default
         end
 
+        def compile_regex
+          code :regex, shift(:regex)
+        end
+
+        def compile_href
+          ref = shift :heredoc_ref, :iheredoc_ref
+          heredoc = Heredoc.new(ref.value, ref.type == :iheredoc_ref)
+          top[:heredocs] ||= []
+          top[:herenum]  ||= 0
+          top[:heredocs] << heredoc
+          code :href, heredoc
+        end
+
+        def compile_heredoc
+          h = shift(:heredoc, :iheredoc)
+
+          top[:heredocs][top[:herenum]].body = [h]
+          top[:herenum] += 1
+          nil
+        end
+
+        def compile_iheredoc_begin
+          start = shift :iheredoc_begin
+          contents = [start]
+
+          loop do
+            contents << compile_vexpression
+            contents << shift(:iheredoc)
+            peek?(:istring_begin)
+          end
+
+          top[:heredocs][top[:herenum]].body = contents
+          top[:herenum] += 1
+          nil
+        end
+
         def compile_istring_begin
           start = shift :istring_begin
           contents = [start]
@@ -49,9 +142,9 @@ module Liquidscript
         end
 
         def compile_object
-          shift :lbrack
+          shift :lbrace
 
-          objects = collect_compiles :rbrack,
+          objects = collect_compiles :rbrace,
             :comma => action.shift,
             :newline => action.shift do
             [compile_object_key, compile_vexpression]
@@ -61,9 +154,9 @@ module Liquidscript
         end
 
         def compile_array
-          shift :lbrace
+          shift :lbrack
 
-          parts = collect_compiles(:vexpression, :rbrace,
+          parts = collect_compiles(:vexpression, :rbrack,
             :comma => action.shift)
 
           code :array, parts
@@ -89,7 +182,7 @@ module Liquidscript
 
         def compile_function_with_parameters(parameters)
           shift :arrow
-          shift :lbrack
+          shift :lbrace
 
           expressions = Liquidscript::ICR::Set.new
           expressions.context = Liquidscript::ICR::Context.new
@@ -107,7 +200,7 @@ module Liquidscript
           end
 
           loop do
-            expect :rbrack => action.end_loop,
+            expect :rbrace => action.end_loop,
                    :_      => expression
           end
 

data/lib/liquidscript/errors.rb

@@ -49,4 +49,10 @@ module Liquidscript
     end
   end
 
+  class NoContextError < SyntaxError
+    def initialize(context)
+      super "Could not find context named #{context.inspect}"
+    end
+  end
+
 end

data/lib/liquidscript/generator/base.rb

@@ -13,7 +13,7 @@ module Liquidscript
       end
 
       def generate
-        replace(@top, {}).to_s
+        replace(@top).to_s
       end
 
       def buffer

data/lib/liquidscript/generator/base/replacements.rb

@@ -8,12 +8,12 @@ module Liquidscript
         #
         # @param code [ICR::Code, #type]
         # @param context [Hash]
-        def replace(code, context = {})
+        def replace(code)
           send(:"generate_#{code.type}",
             code)
 
         rescue NoMethodError => e
-          if e.name == :"_generate_code_#{code.type}"
+          if e.name == :"generate_#{code.type}"
             raise InvalidCodeError.new(code.type)
           else
             raise

data/lib/liquidscript/generator/javascript.rb

@@ -1,6 +1,7 @@
 require "liquidscript/generator/javascript/literals"
 require "liquidscript/generator/javascript/metas"
 require "liquidscript/generator/javascript/objects"
+require "liquidscript/generator/javascript/exceptions"
 
 module Liquidscript
   module Generator
@@ -27,11 +28,31 @@ module Liquidscript
       include Literals
       include Metas
       include Objects
+      include Exceptions
 
       def initialize(top)
         @modules = []
+        @indent = 0
         super
       end
+
+      def indent_level
+        "  " * @indent
+      end
+
+      def indent!
+        @indent += 1
+      end
+
+      def unindent!
+        @indent -= 1
+      end
+
+      def insert_into(area, buffer)
+        area.inject(buffer) do |m, c|
+          m << indent_level << replace(c) << ";\n"
+        end
+      end
     end
   end
 end