liquidscript 0.8.2 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f4ec0aa9bc7b0c5da0b45f80e5853e726757b105
-  data.tar.gz: f204c630f37a8b1df5e55e546e2d11e518dc2211
+  metadata.gz: b457cb6e151caa8e4c94e6c6f6155a6d4fab540d
+  data.tar.gz: 2593be00faad038c0c2d17d5457ccadd1c9b2bba
 SHA512:
-  metadata.gz: 1eb628d19238d73a22c0b6991535d9bbc9c85ba912b0e9a4d75a6864d5ec7938e5d1c14a1cafa87e8ec534225f2d9e1bf8880d61cbe42099a1914355be3d4b91
-  data.tar.gz: a6a58bc3a6f3b201b772c8ed42c6967820f5b3765adffc8fb7b5e7bda49b4a5d4a9e5af66885ae1d1957b8470eb7695da0b376f2e1a7232686e929922b307971
+  metadata.gz: 1147b9665936ae2f33b883d189a5ba9aee3c758e084fcb4a929cad9bfe5e3cfa0ad3c880f20ca21176751b9646e8622c7fb34e9800e89e4ec533567b41a4a51e
+  data.tar.gz: bf1684054f962f5d6ef81b553ec83d5d3995f6ef814ede497d54d53b61fe091f4b5cf33844ab1eed930f57704ecdf9c4a807559f2c59628f3cea32344a490fdf

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

@@ -90,61 +90,44 @@ module Liquidscript
         # @return [ICR::Code]
         def compile_lparen
           shift :lparen
-          maybe_func = 1
-          components = []
 
-          unless peek?(:identifier, :rparen)
-            maybe_func = 0
+          if peek?(:identifier)
+            _compile_lparen_method
+          elsif peek?(:rparen)
+            _compile_lparen_method_final
+          else
+            _compile_lparen_expression
           end
+        end
 
-          expression = action do
-            maybe_func = 0
-            components << compile_vexpression
-          end
+        def _compile_lparen_method
+          ident = shift :identifier
 
-          ident = action do |i|
-            if peek?(:comma)
-              maybe_func = 2
-              components << i
-            elsif peek?(:rparen)
-              components << i
-            else
-              components << value_expect(compile_identifier(i))
-            end
+          if peek?(:comma, :rparen)
+            _compile_lparen_method_final(ident)
+          else
+            value_expect(ident)
           end
+        end
 
-          loop do
-          case maybe_func
-          when 0
-            expect :rparen => action.end_loop,
-              :_           => expression
-          when 1
-            expect :rparen => action.end_loop,
-              :comma       => action { maybe_func = 2 },
-              :identifier  => ident,
-              :_           => expression
-          when 2
-            expect :rparen => action.end_loop,
-              :comma       => action.shift,
-              :identifier  => action { |i| components << i }
-          end
+        def _compile_lparen_method_final(ident = nil)
+          components = [ident].compact
+
+          while peek?(:comma) do
+            shift(:comma)
+            components << shift(:identifier)
           end
 
-          func_decl = (maybe_func == 1 && peek?(:arrow)) ||
-            (maybe_func == 2)
+          shift :rparen
+          compile_function_with_parameters(components)
+        end
 
-          if func_decl
-            compile_function_with_parameters(components)
-          else
-            code(:expression, components.map do |c|
-              if c.is_a?(Scanner::Token)
-               compile_identifier(c)
-              else
-                c
-              end
-            end)
-          end
+        def _compile_lparen_expression
+          out = compile_vexpression
+          shift :rparen
+          code :expression, out
         end
+
       end
     end
   end

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

@@ -20,8 +20,7 @@ module Liquidscript
             continue = [:elsif, :else]
           end
 
-          shift :lbrace
-          body = collect_compiles(:expression, :rbrace)
+          body = _compile_block
 
           args = [type]
           args << conditional if cond

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

@@ -15,6 +15,15 @@ module Liquidscript
           Liquidscript::ICR::Code.new type, *args
         end
 
+        def _compile_block
+          if peek?(:lbrace)
+            shift :lbrace
+            collect_compiles(:expression, :rbrace)
+          else
+            compile_expression
+          end
+        end
+
         def value_expect(v, &default)
           out = expect \
                  :lparen => action { compile_call(v)       },

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

@@ -16,8 +16,7 @@ module Liquidscript
           shift :lparen
           conditional = compile_vexpression
           shift :rparen
-          shift :lbrace
-          body = collect_compiles(:expression, :rbrace)
+          body = _compile_block
           code :while, conditional, body
         end
 
@@ -44,10 +43,9 @@ module Liquidscript
 
           obj = shift :identifier
           shift :rparen
-          shift :lbrace
 
           set ident
-          body = collect_compiles(:expression, :rbrace)
+          body = _compile_block
           code :for_in, ident, ref(obj), body
         end
 
@@ -58,9 +56,8 @@ module Liquidscript
           shift :comma
           third = compile_vexpression
           shift :rparen
-          shift :lbrace
 
-          body = collect_compiles(:expression, :rbrace)
+          body = _compile_block
           code :for_seg, first, second, third, body
         end
 

data/lib/liquidscript/generator/javascript/literals.rb

@@ -136,11 +136,10 @@ module Liquidscript
         def generate_object(code)
 
           object = buffer
-          object.set_join! ', '
-          indent!
+          object.set_join! ",\n#{indent!}"
 
           code[1].inject(object) do |buf, part|
-            buf << "#{indent_level}\"#{part[0].value}\": #{replace(part[1])}"
+            buf << "\"#{part[0].value}\": #{replace(part[1])}"
           end
 
           unindent!

data/lib/liquidscript/generator/javascript/objects.rb

@@ -4,7 +4,7 @@ module Liquidscript
       module Objects
 
         def generate_expression(code)
-          "(#{replace(code[1].first)})"
+          "(#{replace(code[1])})"
         end
 
         def generate_call(code)

data/lib/liquidscript/scanner/liquidscript/main.rb

@@ -107,14 +107,14 @@ module Liquidscript
             on(:string)     { |m| emit :sstring, m    }
             on(:keywords)   { |m| emit :keyword, m    }
             on(:actions)    { |m| emit :action,  m    }
+            on(:binops)     { |m| emit :binop,    m   }
+            on(:preunops)   { |m| emit :preunop,  m   }
+            on(:unops)      { |m| emit :unop,     m   }
             on(%r{<<([A-Z]+)}, :heredoc)
             on(%r{<<-([A-Z]+)}, :iheredoc)
-            on(%r{/(.*?)/([a-z]*)}, :regex)
+            on(%r{r/(.*?)/([gimy]*)}, :regex)
             on(%r{"} => :istring)
             on("///" => :block_regex)
-            on(:binops)     { |m| emit :binop,    m   }
-            on(:preunops)   { |m| emit :preunop,  m   }
-            on(:unops)      { |m| emit :unop,     m   }
             on("->")        {     emit :arrow         }
             on("=")         {     emit :equal         }
             on("{")         {     emit :lbrace        }

data/lib/liquidscript/version.rb

@@ -1,5 +1,5 @@
 module Liquidscript
 
   # The current version of liquidscript.
-  VERSION = "0.8.2".freeze
+  VERSION = "0.9.0".freeze
 end

data/spec/fixtures/expression.generate.yml

@@ -1,4 +1,7 @@
 data: |
   (2)
+  #! allow Math
+  Math.round(5 / (10 / 100) * 100)
 
-compiled: "(2);"
+
+compiled: "(2); Math.round(5 / (10 / 100) * 100);"

data/spec/fixtures/literals.generate.yml

@@ -1,7 +1,7 @@
 data: |
   object = { hello: "world" }
   test = [1, 2]
-  regex = /^test/
+  regex = r/^test/
   block = ///
     ^test # comment
   ///

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: liquidscript
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.9.0
 platform: ruby
 authors:
 - Jeremy Rodi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-09 00:00:00.000000000 Z
+date: 2014-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler