liquidscript 0.7.1 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 32708208fcf1f212c031c3d7e843219653887748
-  data.tar.gz: 8bf0b59774f62cdcaf18fc130cbbc8723311627e
+  metadata.gz: fcd4572f6244e74518ddb988910f066627aff8e4
+  data.tar.gz: a36a4d62484529f05dfecd1664e7310e944479ef
 SHA512:
-  metadata.gz: 48960e3bcdea3d27a3c4bf0b5e3e182b4e2f4d0731c4cffeba7eba89a1e8cd3202663d4a45b49f825edd467db704080f38e0e544b062f03c1b816f0cbad863c8
-  data.tar.gz: 9c60166e3f63e8b96f3d7c055b86e037b17d955b7182da3be656f10d8be5405df98c83b0f83af10c7cf49e74710cd34d54b9718a5b6f1e21c9905e4df52fea3a
+  metadata.gz: 8509763bef19d45729b5b5e932891a4ba30a7c698c64d254d22a2dd954c8c987505697ea0b503f3ff2ecd2568c0bce250136fa90f86fa43f567f20b77b6570b4
+  data.tar.gz: 55290754b7ac6ead257b0a2bf6e25b4ef1b662c76ed18b2664e21a0761733b87c39e679c3a325ef8050d206b19fee5de6217b98f47134ea904491717f36398fd

data/bin/lscript

@@ -10,14 +10,25 @@ end
 infile = ARGV.shift
 outfile = ARGV.shift || infile.gsub(/\.liq\Z/, ".js")
 
-File.open(infile, "r") do |f|
+if infile == '-'
+  infile = $stdin
+else
+  infile = File.open(infile, "r")
+end
+
+if outfile == '-'
+  outfile = $stdout
+else
+  outfile = File.open(outfile, "w")
+end
 
-  begin
-    out = Liquidscript.compile(f.read)
-    File.open(outfile, "w") { |o| o.write out }
-  rescue StandardError => e
+begin
+  out = Liquidscript.compile(infile.read)
+  outfile.write(out)
+rescue StandardError => e
     $stderr.puts "ERROR: #{e.class}: #{e.message}"
     $stderr.puts e.backtrace[0..5].map { |s| "\t#{s.gsub(/^.*?\/lib\/liquidscript\//, "")}" }.join("\n")
-  end
-
+ensure
+  [infile, outfile].each(&:close)
 end
+

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

@@ -177,7 +177,6 @@ module Liquidscript
 
         def compile_function_with_parameters(parameters)
           shift :arrow
-          shift :lbrace
 
           expressions = Liquidscript::ICR::Set.new
           expressions.context = Liquidscript::ICR::Context.new
@@ -194,9 +193,14 @@ module Liquidscript
             expressions << compile_expression
           end
 
-          loop do
-            expect :rbrace => action.end_loop,
-                   :_      => expression
+          unless peek?(:lbrace)
+            expression.call
+          else
+            shift :lbrace
+            loop do
+              expect :rbrace => action.end_loop,
+                     :_      => expression
+            end
           end
 
           code :function, @set.pop

data/lib/liquidscript/version.rb

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

data/spec/fixtures/inline.generate.yml

@@ -0,0 +1,10 @@
+data: |
+  some-function = -> console.log("test")
+  some-function()
+
+compiled: |
+  var someFunction;
+  someFunction = function() {
+    console.log("test");
+  };
+  someFunction();

data/spec/liquidscript/node_spec.rb

@@ -12,7 +12,7 @@ describe "Node support" do
       content = YAML.load_file file
       file =~ /spec\/fixtures\/(.*)\.yml/
 
-      it "generates #{$1}" do
+      it "runs #{$1}" do
         expect(content["data"]).to run
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: liquidscript
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
 platform: ruby
 authors:
 - Jeremy Rodi
@@ -165,6 +165,7 @@ files:
 - spec/fixtures/function.generate.yml
 - spec/fixtures/get.generate.yml
 - spec/fixtures/heredoc.generate.yml
+- spec/fixtures/inline.generate.yml
 - spec/fixtures/literals.generate.yml
 - spec/fixtures/loop.generate.yml
 - spec/fixtures/main.compile.yml
@@ -225,6 +226,7 @@ test_files:
 - spec/fixtures/function.generate.yml
 - spec/fixtures/get.generate.yml
 - spec/fixtures/heredoc.generate.yml
+- spec/fixtures/inline.generate.yml
 - spec/fixtures/literals.generate.yml
 - spec/fixtures/loop.generate.yml
 - spec/fixtures/main.compile.yml