liquidscript 0.7.6 → 0.7.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4a3cff126272cbbc86d9729e2d9d8377288993d6
-  data.tar.gz: e5ad5d6a4431246d57a236dcee19f592e3696cdc
+  metadata.gz: c31e6b59cd1bc0b5b1f61bb0514831a060b516c7
+  data.tar.gz: 1d85d0be0209027858d030cc9c8cda978e68b95d
 SHA512:
-  metadata.gz: 3c6da54b9efa5bfa45aee059d772296269bbd5939314051abfd503e104dc920c48cc49c82ae7d9531c52090a1aa00bdea6280d79ceebc531aa51a030bba1bb0b
-  data.tar.gz: 3a9a399c1785dd9c7c324182aa6dfbcb35b6d5224aec85360fa32ea0362641743aa9abb31e4db72630f126883a4ccef061cdab9629a498008ec22bdd56267b69
+  metadata.gz: 948fb308df1606bf6ce3d11bd6cda543dbdc321b9fa913ef0ad7e568850f3c7bb01e3a736cf055210ffab8cf1cc1069be2fefac015ca060591bc748a2ef5bcbe
+  data.tar.gz: 5d28502b4a07f1ddaf96840c017f6c88e2a27f944dcf17060f795768d82264b6aa8d2f6b0a94ba85a4c8d0efe89389da869ca3c659a760d12c7777accf9334bb

data/bin/lscript

@@ -1,34 +1,6 @@
 #!/usr/bin/env ruby
 
 require "liquidscript"
+require "liquidscript/cli"
 
-if ARGV.length < 1
-  puts "Usage: #{File.basename($0)} infile [outfile]"
-  exit 1
-end
-
-infile = ARGV.shift
-outfile = ARGV.shift || infile.gsub(/\.liq\Z/, ".js")
-
-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(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")
-ensure
-  [infile, outfile].each(&:close)
-end
-
+Liquidscript::CLI.start(ARGV)

data/lib/liquidscript/cli.rb

@@ -0,0 +1,53 @@
+require "thor"
+
+module Liquidscript
+  class CLI < Thor
+
+    desc "compile FILES", "Compile the given file to javascript."
+    long_desc <<-LONGDESC
+      It will compile each file listed to javascript.  If the file
+      given is `-`, it will check the standard input for file data.
+      By default, this will output to standard output - if this isn't
+      what you want, use the -o option to change it.
+
+      Note that if you pass in multiple files,
+      the last file's compiled output will be in this file (i.e.
+      multiple output files are not yet supported).  If you want the
+      output to go to standard output, use `-` as the value.
+
+      > $ lscript compile test.liq
+    LONGDESC
+    option :out, :aliases => :o, :desc => "The output file."
+    def compile(*files)
+      files.each do |file|
+        puts "COMPILING: #{file}"
+        perform_compiliation(file,
+          options[:out] || file.gsub('.liq', '.js'))
+      end
+    end
+
+    private
+
+    def perform_compiliation(file, out)
+      infile = if file == '-'
+        $stdin
+      else
+        File.open(file, "r")
+      end
+
+      outfile = if out == '-'
+        $stdout
+      else
+        File.open(out, "w")
+      end
+
+      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")
+    ensure
+      ([infile, outfile] - [$stdin, $stdout]).each(&:close)
+    end
+  end
+end

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

@@ -109,7 +109,7 @@ module Liquidscript
             elsif peek?(:rparen)
               components << i
             else
-              components << compile_identifier(i)
+              components << value_expect(compile_identifier(i))
             end
           end
 

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

@@ -39,27 +39,6 @@ module Liquidscript
           call = code :call, subject, *arguments
           call
         end
-
-        protected
-
-        def value_expect(v, &default)
-          out = expect \
-                 :lparen => action { compile_call(v)       },
-                 :equal  => action { compile_assignment(v) },
-                 :prop   => action { compile_property(v)   },
-                 :lbrack => action { compile_access(v)     },
-                 [:binop,
-                  :minus,
-                  :plus] => action { compile_binop(v)      },
-                 :unop   => action { |o| code :op, v, o    },
-                 :_      => default || action { v          }
-
-          if out != v
-            value_expect(out)
-          else
-            out
-          end
-        end
       end
     end
   end

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

@@ -14,6 +14,25 @@ module Liquidscript
         def code(type, *args)
           Liquidscript::ICR::Code.new type, *args
         end
+
+        def value_expect(v, &default)
+          out = expect \
+                 :lparen => action { compile_call(v)       },
+                 :equal  => action { compile_assignment(v) },
+                 :prop   => action { compile_property(v)   },
+                 :lbrack => action { compile_access(v)     },
+                 [:binop,
+                  :minus,
+                  :plus] => action { compile_binop(v)      },
+                 :unop   => action { |o| code :op, v, o    },
+                 :_      => default || action { v          }
+
+          if out != v
+            value_expect(out)
+          else
+            out
+          end
+        end
       end
     end
   end

data/lib/liquidscript/errors.rb

@@ -31,18 +31,20 @@ module Liquidscript
     private
 
     def build_error_message
-      str = "Expected one of %{expected}, got %{type}"
+      str = "Expected one of %{expected}, got %{type}(%{value})"
       hash = {
         :expected => @expected.map { |e| e.to_s.upcase }.join(', ')
       }
 
       if @got.is_a? Symbol
-        hash[:type] = @got.to_s.upcase
+        hash[:type]  = @got.to_s.upcase
+        hash[:value] = ""
       else
         str << " (line %{line}, column %{column})"
         hash.merge! :type   => @got.type.to_s.upcase,
                     :line   => @got.line,
-                    :column => @got.column
+                    :column => @got.column,
+                    :value  => @got.value
       end
 
       sprintf(str, hash)

data/lib/liquidscript/scanner/token.rb

@@ -20,7 +20,7 @@ module Liquidscript
       end
 
       def to_a
-        [@type, @value]
+        [@type, @value, @line, @column]
       end
 
       def type?(type)

data/lib/liquidscript/version.rb

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

data/liquidscript.gemspec

@@ -25,4 +25,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "command-runner"
 
   spec.add_dependency "hashie", "~> 2.0"
+  spec.add_dependency "thor"
 end

data/spec/fixtures/underscore.js

@@ -21,7 +21,7 @@
   nativeEvery = ArrayProto.every;
   nativeSome = ArrayProto.some;
   nativeIndexOf = ArrayProto.indexOf;
-  nativeLastIndexOf = arrayProto.lastIndexOf;
+  nativeLastIndexOf = ArrayProto.lastIndexOf;
   nativeIsArray = Array.isArray;
   nativeKeys = Object.keys;
   nativeBind = FuncProto.bind;

data/spec/fixtures/underscore.liq

@@ -25,7 +25,7 @@
   nativeEvery       = ArrayProto.every
   nativeSome        = ArrayProto.some
   nativeIndexOf     = ArrayProto.indexOf
-  nativeLastIndexOf = arrayProto.lastIndexOf
+  nativeLastIndexOf = ArrayProto.lastIndexOf
   nativeIsArray     = Array.isArray
   nativeKeys        = Object.keys
   nativeBind        = FuncProto.bind

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: liquidscript
 version: !ruby/object:Gem::Version
-  version: 0.7.6
+  version: 0.7.7
 platform: ruby
 authors:
 - Jeremy Rodi
@@ -94,6 +94,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: thor
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A javascript-based language that compiles to javascript.
 email:
 - redjazz96@gmail.com
@@ -114,6 +128,7 @@ files:
 - bin/lscript
 - lib/liquidscript.rb
 - lib/liquidscript/buffer.rb
+- lib/liquidscript/cli.rb
 - lib/liquidscript/compiler.rb
 - lib/liquidscript/compiler/base.rb
 - lib/liquidscript/compiler/base/action.rb