liquidscript 0.10.2 → 0.10.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d86b163ef0293732b6aca713fccb309af5239f05
-  data.tar.gz: 15b8b68dceba0eafbda48be35f3dd1b0b71d13a8
+  metadata.gz: 807022c4ded4e5b09cc881aa23814c524a8762e3
+  data.tar.gz: f798b85fe050801808dca1dcd75876dbcb1a6a75
 SHA512:
-  metadata.gz: ee42e06c937b2243f25e2db3618533cb58179581459d61cf174733549398b2a353c56d1c33ebb1f0baaea47ac41efac7e9d60b751ba687b25371d0230bbe6509
-  data.tar.gz: 676fe68eb8b5a2af88b8d8bd25a1fd2a14dfd44e79e8284ffbef9c4e49117d36841858d82337c7f68123a5cf41a2b49f53f6428938ae782a31e748de38a0b7dc
+  metadata.gz: f9d7c9c7d1c98c9c291a69aa6ef59f0429dd06e72bb89357d2d1e3afdf039ad52f8260c449485a1a9281c9a062969365d2808ddcf30881aa7a7fa35d3d9a7574
+  data.tar.gz: ff62531459d871bdeabb0bf95b94f55ed96e0fdccdfda145cda0662cf7e9c17933fdf7c8dfc1811ae9fd3afe9111d609ba712eaff5b81ea7ee5b3cf3b3b10b2c

data/README.md

@@ -57,7 +57,7 @@ func()
 
 ## Contributing
 
-1. Fork it ( http://github.com/medcat/liquidscript/fork )
+1. Fork it (<http://github.com/medcat/liquidscript/fork>)
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)

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

@@ -58,12 +58,12 @@ module Liquidscript
             raise CompileError, "Expected `in', got #{content.value}"
           end
 
-          obj = shift :identifier
+          obj = compile_vexpression
           shift :rparen
 
           v = set(ident)
           body = _compile_block
-          code :for_in, v, ref(obj), body
+          code :for_in, v, obj, body
         end
 
         def _compile_for_seg(first)

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

@@ -21,12 +21,20 @@ module Liquidscript
         def generate_nrange(code)
           start  = code[1]
           ending = code[2]
-
-          buffer << "[" << (start..ending).to_a.join(', ') << "]"
+          
+          if (start.to_i - ending.to_i).abs > 50
+            generate_range(code, true)
+          elsif ending > start
+            buffer << "[" << (start..ending).to_a.join(', ') << "]"
+          else
+            buffer << "[" << (ending..start).to_a.reverse.join(', ') << "]"
+          end
         end
 
-        def generate_range(code)
+        def generate_range(code, norep=false)
           out = buffer
+          a = norep ? code[1] : replace(code[1])
+          b = norep ? code[2] : replace(code[2])
           out << "(function(a, b) {\n"                          <<
                  indent!   << "var out, i, t;\n"                <<
                  indent    << "out = [];\n"                     <<
@@ -38,8 +46,7 @@ module Liquidscript
                  unindent! << "};\n"                            <<
                  indent    << "return t === undefined ?"        <<
                               "out : out.reverse();\n"          <<
-                 unindent! << "})(" << replace(code[1]) << ", " <<
-                 replace(code[2]) << ")"
+                 unindent! << "})(" << a << ", " << b << ")"  
           out
         end
 
@@ -67,12 +74,14 @@ module Liquidscript
         end
 
         def generate_for_in(code)
-          loop_body = buffer
-          loop_body << "for(#{code[1].to_s} in #{code[2].name}) {\n"
-          indent!
-          insert_into(code[3], loop_body)
-          unindent!
-          loop_body << indent << "}"
+          temporary_variable(2) do |v,d|
+            loop_body = buffer
+            loop_body << "var #{v}, #{d} = #{replace(code[2])};\n" <<
+              indent  << "for(#{v} in #{d}) {\n"                   <<
+              indent! << "#{code[1].to_s} = #{d}[#{v}];\n"
+            insert_into(code[3], loop_body)
+            loop_body << unindent! << "}"
+          end
         end
 
         def generate_for_seg(code)
@@ -152,10 +161,6 @@ module Liquidscript
           "#{replace(code[2])} #{op} #{replace(code[3])}"
         end
 
-        #def generate_identifier(code)
-        #  code.value
-        #end
-
         def generate_variable(code)
           code.to_s
         end
@@ -207,6 +212,27 @@ module Liquidscript
 
           function << indent_level << "}"
         end
+
+        private
+
+        def temporary_variable(n)
+          return unless n > 0
+          variable = 'i'
+          yielded = []
+          @_temporary_variable ||= -1
+          @_temporary_variable  +=  1
+          @_temporary_variable.times { variable.succ! }
+          yielded << variable
+
+          n.times do
+            new_var = yielded.last.dup
+            @_temporary_variable += 1
+            yielded << yielded.last.succ
+          end
+          out = yield *yielded.map { |x| "_#{x}" }
+          @_temporary_variable  -=  n
+          out
+        end
       end
     end
   end

data/lib/liquidscript/version.rb

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

data/spec/fixtures/literals.generate.yml

@@ -2,6 +2,7 @@ data: |
   object = { hello: "world" }
   test = [1, 2]
   range = 0x1..0x9
+  range2 = 10..1
   regex = r/^\/test/
   block = ///
     ^test # comment
@@ -9,10 +10,11 @@ data: |
   regex == block
 
 compiled: |
-  var object, test, range, regex, block;
+  var object, test, range, range2, regex, block;
   object = { "hello": "world" };
   test = [1, 2];
   range = [0x1, 0x2, 0x3, 0x4, 0x5, 0x6, 0x7, 0x8, 0x9];
+  range2 = [10, 9, 8, 7, 6, 5, 4, 3, 2, 1];
   regex = /^\/test/;
   block = /^test/;
   regex === block;

data/spec/fixtures/loop.generate.yml

@@ -9,8 +9,17 @@ data: |
     console.log(t)
   }
 
+  for(v in 1..5) {
+    console.log(v)
+  }
+
 compiled: |
-  var t;
+  var t, v;
   t = 0x5;
   while(t > 0) { t--; };
   for(t = 0; t < 5; t += 1) { console.log(t); };
+  var _i, _j = [1, 2, 3, 4, 5];
+  for(_i in _j) {
+    v = _j[_i];
+    console.log(v);
+  };

metadata

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