liquidscript 0.7.12 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 81818718ba26d7134d542545b3b19e9008f88ef4
-  data.tar.gz: 8f3bcb8c445c7fec88a98f99dce14afdcc064dd6
+  metadata.gz: 20d97cd63491fe33e34d37dac00eab8bb7f5f7dd
+  data.tar.gz: 8bed64d2660f46dd9f4de474e756d6325fbd1f95
 SHA512:
-  metadata.gz: 59c2abf77dc9bc5f570e18ad6a1e9a87052eba96ee0053effff3181baeaffb6e8c4ecad979e6c622194e57143fcbffaa20f436d13de0690721be516127bbbf23
-  data.tar.gz: a22a56199f840defcdc4c107468449e32f982a2590ae1f25602c99df860f045ffdda4672e13f9662d44616b5c4d17723054e4c55312d6c7b803fb5731ded1d0b
+  metadata.gz: b992528f87b397087159d786bf4b7fef4b23841413ab317e0d15e1079ceb75f94ea165cfef0bfa43cb17612641478321be5f5158e5f902ae2a56a92b563e1055
+  data.tar.gz: 6092259df275c92ac0ffbf39acc0ac65bba66fd2c68d21eb11f39e562705f3ff4a1a82d8adcfe38ff5074d34c9e227e0f97cbe791363105d787dbf7687fa3e7e

data/lib/liquidscript/compiler/base/callable.rb

@@ -32,6 +32,23 @@ module Liquidscript
           end
         end
 
+        # This applies only as many arguments as the block or function
+        # needs.  This is just so that calling a method is easier,
+        # so the developer doesn't have to worry about arity and
+        # such.
+        #
+        # @param args [Object] passed to the call.
+        # @return [Object] the result of the call.
+        def apply(*args)
+          return call if arity == 0
+
+          if block_given?
+            call(*yield[0..arity])
+          else
+            call(*args[0..arity])
+          end
+        end
+
         # How many arguments the call can take.  If this represents a
         # block that has tricks enabled, then this isn't an issue; if
         # it's a method call, however, it becomes important.

data/lib/liquidscript/compiler/icr.rb

@@ -4,6 +4,7 @@ require "liquidscript/compiler/icr/literals"
 require "liquidscript/compiler/icr/classes"
 require "liquidscript/compiler/icr/helpers"
 require "liquidscript/compiler/icr/heredoc"
+require "liquidscript/compiler/icr/groups"
 
 module Liquidscript
   module Compiler
@@ -14,6 +15,7 @@ module Liquidscript
       include Literals
       include Classes
       include Helpers
+      include Groups
 
       # (see Base#initialize)
       def initialize(*)

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

@@ -145,82 +145,6 @@ module Liquidscript
             end)
           end
         end
-
-        [:if, :elsif].each do |key|
-          define_method(:"compile_#{key}") do
-            shift key
-            shift :lparen
-            conditional = compile_vexpression
-            shift :rparen
-            shift :lbrace
-
-            body = collect_compiles(:expression, :rbrace)
-
-            if peek?(:elsif, :else)
-              code key, conditional, body, expect(:elsif, :else)
-            else
-              code key, conditional, body
-            end
-          end
-        end
-
-        def compile_unless
-          shift :unless
-          shift :lparen
-          conditional = compile_vexpression
-          shift :rparen
-          shift :lbrace
-
-          body = collect_compiles(:expression, :rbrace)
-          code :unless, conditional, body
-        end
-
-        def compile_else
-          shift :else
-          shift :lbrace
-
-          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

@@ -39,6 +39,40 @@ module Liquidscript
           call = code :call, subject, *arguments
           call
         end
+
+
+        def compile_function_with_parameters(parameters)
+          shift :arrow
+
+          expressions = _build_set(parameters)
+
+          if peek?(:lbrace)
+            shift :lbrace
+            collect_compiles(:rbrace) do
+              expressions << compile_expression
+            end
+          else
+            expressions << compile_expression
+          end
+
+          code :function, @set.pop
+        end
+
+        private
+
+        def _build_set(parameters)
+          expressions = Liquidscript::ICR::Set.new
+          expressions.context = Liquidscript::ICR::Context.new
+          expressions.context.parent = top.context
+          expressions[:arguments] = parameters
+          @set << expressions
+
+          parameters.each do |parameter|
+            set(parameter).parameter!
+          end
+
+          expressions
+        end
       end
     end
   end

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

@@ -0,0 +1,68 @@
+module Liquidscript
+  module Compiler
+    class ICR < Base
+      module Groups
+
+        def _compile_group(type, cond = false, continue = false)
+          shift type
+
+          if cond ||= block_given?
+            shift :lparen
+            if block_given?
+              conditional = yield
+            else
+              conditional = compile_vexpression
+            end
+            shift :rparen
+          end
+
+          if continue && !continue.is_a?(Array)
+            continue = [:elsif, :else]
+          end
+
+          shift :lbrace
+          body = collect_compiles(:expression, :rbrace)
+
+          args = [type]
+          args << conditional if cond
+          args << body
+          args << expect(*continue) if continue and peek?(*continue)
+
+          code(*args)
+        end
+
+        private :_compile_group
+
+        def compile_if
+          _compile_group(:if, true, true)
+        end
+
+        def compile_elsif
+          _compile_group(:elsif, true, true)
+        end
+
+        def compile_unless
+          _compile_group(:unless)
+        end
+
+        def compile_else
+          _compile_group(:else, false)
+        end
+
+        def compile_try
+          _compile_group(:try, false, [:catch, :finally])
+        end
+
+        def compile_catch
+          _compile_group(:catch, false, [:finally]) do
+            shift :identifier
+          end
+        end
+
+        def compile_finally
+          _compile_group(:finally)
+        end
+      end
+    end
+  end
+end

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

@@ -94,16 +94,7 @@ module Liquidscript
         def compile_iheredoc_begin
           start = shift :iheredoc_begin
           contents = [start]
-
-          loop do
-            contents << compile_vexpression
-            if peek?(:iheredoc_begin)
-              contents << shift(:iheredoc_begin)
-            else
-              contents << shift(:iheredoc)
-              false
-            end
-          end
+          _compile_interop(:iheredoc, contents)
 
           top[:heredocs][top[:herenum]].body = contents
           top[:herenum] += 1
@@ -113,17 +104,7 @@ module Liquidscript
         def compile_istring_begin
           start = shift :istring_begin
           contents = [start]
-
-          loop do
-            contents << compile_vexpression
-            if peek?(:istring_begin)
-              contents << shift(:istring_begin)
-            else
-              contents << shift(:istring)
-              false
-            end
-          end
-
+          _compile_interop(:istring, contents)
 
           code :interop, *contents
         end
@@ -183,35 +164,18 @@ module Liquidscript
           end
         end
 
-        def compile_function_with_parameters(parameters)
-          shift :arrow
-
-          expressions = Liquidscript::ICR::Set.new
-          expressions.context = Liquidscript::ICR::Context.new
-          expressions.context.parent = top.context
-          expressions[:arguments] = parameters
-          @set << expressions
-
-          parameters.each do |parameter|
-            set(parameter).parameter!
-          end
-
-
-          expression = action do
-            expressions << compile_expression
-          end
+        private
 
-          unless peek?(:lbrace)
-            expression.call
-          else
-            shift :lbrace
-            loop do
-              expect :rbrace => action.end_loop,
-                     :_      => expression
+        def _compile_interop(type, contents)
+          loop do
+            contents << compile_vexpression
+            if peek?(:"#{type}_begin")
+              contents << shift(:"#{type}_begin")
+            else
+              contents << shift(type)
+              false
             end
           end
-
-          code :function, @set.pop
         end
 
       end

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

@@ -1,4 +1,4 @@
-  module Liquidscript
+module Liquidscript
   module Generator
     class Javascript
       module Objects
@@ -35,113 +35,95 @@
         end
 
         def generate_class(code)
-          body       = buffer
-          class_name = code[1].value
-
-          in_module(class_name) do |last_module|
-            body.block 7 - @indent, <<-JS
-              #{class_name} = #{class_name} || function #{class_name}() {
-                if(this.initialize) {
-                  this.initialize.apply(this, arguments);
-                }
-              }
-            JS
-
-            if code[2]
-              body.block 8 - @indent, <<-JS
-                #{class_name}.prototype.__proto__ = #{code[2].value};
-              JS
-            end
+          _context :name        => code[1].value,
+                   :inherit     => code[2],
+                   :parts       => code[3],
+                   :inheritance => "%{name}.prototype.__proto__     = %{inherit};\n",
+                   :identifier  => "%{name}.prototype.%{value}      = %{replace};\n",
+                   :istring     => "%{name}.prototype[\"%{value}\"] = %{replace};\n",
+                   :property    => "%{name}.%{value}                = %{replace};\n",
+                   :head        => "%{name} = %{name} || function %{name}() { " +
+                                   "if(this.initialize) { this.initialize.apply(this, " +
+                                   "arguments); } };\n"
+        end
 
-            code[3].each do |part|
-              k, v = part
-              case k.type
-              when :identifier
-                body.block 8 - @indent, <<-JS
-                  #{class_name}.prototype.#{k.value} = #{replace(v)};
-                JS
-              when :istring
-                body.block 8 - @indent, <<-JS
-                  #{class_name}.prototype[#{k.value}] = #{replace(v)};
-                JS
-              when :property
-                if k[1].value != "this"
-                  raise InvalidCodeError.new(k[1].value)
-                end
-
-                body.block 8 - @indent, <<-JS
-                  #{class_name}.#{k[2]} = #{replace(v)};
-                JS
-              when :class
-                body << generate_class(part)
-              when :module
-                body << generate_module(part)
-              end
-            end
+        def generate_module(code)
+          _context :name       => code[1].value,
+                   :parts      => code[2],
+                   :head       => "%{name} = %{name} || {};\n",
+                   :identifier => "%{name}.%{value} = %{replace};\n",
+                   :istring    => "%{name}[\"%{value}\"] = %{replace};\n",
+                   :property   => false
+        end
 
-            if last_module
-              body.block 7, <<-JS
-                #{last_module}.#{class_name} = #{class_name}
-              JS
-            end
+        protected
 
-          end
+        def current_module
+          @modules.last
+        end
 
-          body
+        def in_module(module_name)
+          @modules << module_name
+          out = yield @modules[-2]
+          @modules.pop
+          out
         end
 
-        def generate_module(code)
+        def _context(options)
           body = buffer
-          module_name = code[1].value
-
-          in_module(module_name) do |last_module|
-            body << "#{module_name} = #{module_name} || {};"
-
-            code[2].each do |part|
-              k, v = part
-              to_match = if k.is_a? Symbol
-                k
-              else
-                k.type
-              end
-
-              case to_match
-              when :identifier
-                body.block 7, <<-JS
-                  #{module_name}.#{k.value} = #{replace(v)};
-                JS
-              when :istring
-                body.block 7, <<-JS
-                  #{module_name}["#{k.value}"] = #{replace(v)};
-                JS
-              when :class
-                body << generate_class(part)
-              when :module
-                body << generate_module(part)
-              end
+          name = options[:name]
+          opts = { :name => name }
+
+          in_module(name) do |last_module|
+            opts[:last] = last_module
+            _build_header(body, options, opts)
+
+            options[:parts].each do |part|
+              _build_element(body, options, opts, part)
             end
 
             if last_module
-              body.block 7, <<-JS
-                #{last_module}.#{module_name} = #{module_name}
-              JS
+              body << "#{last_module}.#{name} = #{name};\n"
             end
           end
 
           body
         end
 
-        protected
+        def _build_element(body, options, opts, part)
+          k, v = part
 
-        def current_module
-          @modules.last
+          type = if k.is_a? Symbol then k else k.type end
+
+          case type
+          when :identifier, :istring
+            opts[:value] = k.value
+            opts[:replace] = replace(v)
+
+            body << sprintf(options[k.type], opts)
+          when :property
+            opts[:value]   = k[2]
+            opts[:replace] = replace(v)
+
+            if k[1].value == "this" && options[k.type]
+              body << sprintf(options[k.type], opts)
+            else
+              raise InvalidCodeError.new(k[1].value)
+            end
+          when :class
+            body << generate_class(part)
+          when :module
+            body << generate_module(part)
+          end
         end
 
-        def in_module(module_name)
-          @modules << module_name
-          out = yield @modules[-2]
-          @modules.pop
-          out
+        def _build_header(body, options, opts)
+          body << sprintf(options[:head], opts)
+
+          if options[:inherit]
+            opts[:inherit] = options[:inherit].value
+            body << sprintf(options[:inheritance], opts)
+          end
         end
 
       end

data/lib/liquidscript/icr/sexp.rb

@@ -32,7 +32,7 @@ module Liquidscript
         else
           body = v.to_s.gsub(/\"/, "\\\"")
 
-          if body.include? " "
+          if body.match(/[\s]/)
             "\"#{body}\""
           elsif body.length == 0
             nil

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

@@ -46,7 +46,7 @@ module Liquidscript
             )
 
             set :binops, %w(
-              * / ^
+              * / ^ %
               << >> >>>
               === ==
               !== !=

data/lib/liquidscript/version.rb

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

data/spec/fixtures/class.generate.yml

@@ -25,7 +25,7 @@ compiled: |
     if(this.initialize) {
       this.initialize.apply(this, arguments);
     }
-  }
+  };
 
   Test.prototype.wee = function() {
     console.log(2);
@@ -38,6 +38,6 @@ compiled: |
   Test.test = function() {
     "class method!";
   };
-  Something.Test = Test;
+  Something.Test = Test;;
 
   module.exports = Something;

data/spec/fixtures/combination.generate.yml

@@ -21,7 +21,7 @@ compiled: |
     if(this.initialize) {
       this.initialize.apply(this, arguments);
     }
-  }
+  };
 
   Thing.prototype.initialize = function() {
     this.test = new Test();
@@ -30,4 +30,4 @@ compiled: |
   Thing.prototype.do = function(thing) {
     return this.test.do(thing);
   };
-  SomeModule.Thing = Thing;
+  SomeModule.Thing = Thing;;

data/spec/fixtures/example.generate.yml

@@ -22,7 +22,7 @@ compiled: |
     if(this.initialize) {
       this.initialize.apply(this, arguments);
     }
-  }
+  };
 
   Greeter.prototype.initialize = function(name) {
     this.name = name;

data/spec/fixtures/heredoc.generate.yml

@@ -2,8 +2,8 @@ data: |
   console.log(<<TEST, <<-MAYBE)
   hello world
   TEST
-  hello #{console} durr #{console.log}
+  hello #{console} durr #{console.log} brrr
   MAYBE
 
 compiled: |
-  console.log("hello world", "hello " + console + " durr " + console.log + "");
+  console.log("hello world", "hello " + console + " durr " + console.log + " brrr");

data/spec/fixtures/string2.generate.yml

@@ -0,0 +1,17 @@
+data: |
+  string = "hello
+
+  world" # this'll translate to "hello\n\nworld"
+
+  single = 'test # there doesn't need to be an endquote here.
+
+  another-string = <<-TEST
+    #{string}, foo bar #{single} fffffuuu
+  TEST
+
+compiled: |
+  var string,single,anotherString;
+
+  string = "hello\n\nworld";
+  single = 'test';
+  anotherString = "  " +  string + ", foo bar " + single + " fffffuuu";

data/spec/support/matchers/run.rb

@@ -7,6 +7,6 @@ RSpec::Matchers.define :run do
   end
 
   failure_message_for_should do
-    "Expected to run, got:\n#{@message.stderr}"
+    "Expected to run, got:\n#{@message.stderr}\n\n#{@output}"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: liquidscript
 version: !ruby/object:Gem::Version
-  version: 0.7.12
+  version: 0.8.0
 platform: ruby
 authors:
 - Jeremy Rodi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-04 00:00:00.000000000 Z
+date: 2014-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -139,6 +139,7 @@ files:
 - lib/liquidscript/compiler/icr/classes.rb
 - lib/liquidscript/compiler/icr/expressions.rb
 - lib/liquidscript/compiler/icr/functions.rb
+- lib/liquidscript/compiler/icr/groups.rb
 - lib/liquidscript/compiler/icr/helpers.rb
 - lib/liquidscript/compiler/icr/heredoc.rb
 - lib/liquidscript/compiler/icr/literals.rb
@@ -193,6 +194,7 @@ files:
 - spec/fixtures/set.generate.yml
 - spec/fixtures/string.compile.yml
 - spec/fixtures/string.generate.yml
+- spec/fixtures/string2.generate.yml
 - spec/fixtures/underscore.js
 - spec/fixtures/underscore.liq
 - spec/liquidscript/buffer_spec.rb
@@ -254,6 +256,7 @@ test_files:
 - spec/fixtures/set.generate.yml
 - spec/fixtures/string.compile.yml
 - spec/fixtures/string.generate.yml
+- spec/fixtures/string2.generate.yml
 - spec/fixtures/underscore.js
 - spec/fixtures/underscore.liq
 - spec/liquidscript/buffer_spec.rb