liquidscript 0.6.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2602bc9103770266bde3fdb0e822f67791414fc9
-  data.tar.gz: ec71b4b0af8544970847621c4c24f9c161a0823b
+  metadata.gz: 294e4c6a0c4f14b51aa48ac555de488b94308ac7
+  data.tar.gz: 412b48e5603ee3871ebc7889c25dfafac288f473
 SHA512:
-  metadata.gz: e8975e7a72e1883d658a017e6022af516995c3f67db19856d996d85d834b9eb1d0e792e6dd5facd8ab4d0a4e3951eb7c127fe70068ca8df54c1543c69cfc9a16
-  data.tar.gz: b06daa98f1a904bee00a12c74f399e78683f6618a601fe960899c7c0175e681488308cababb9efc2038ef4496c24024b3c93a2e011e2630f0d1916ac42f345b3
+  metadata.gz: 2f0c008c716700c45618878f3a34dd56fa9d656e52bdff254be77513795e2271bf51757ed67afa1fa34b81adb8e4ac5229f42fcaa761b9141020e909b50c5a0a
+  data.tar.gz: 9b9c4341ec21542b483356a592f85664a40dd607a7f3987561ca407cf31b7d5e0b9b4300466cbf9b929a2956bcbfbfeae59d4e445a6185f86ebbf08c21424f6b

data/README.md

@@ -1,6 +1,6 @@
 # ![Liquidscript](http://i.imgur.com/xbdhTsr.png)
 
-[![Build Status](https://travis-ci.org/redjazz96/liquidscript.png?branch=master)](https://travis-ci.org/redjazz96/liquidscript) [![Coverage Status](https://coveralls.io/repos/redjazz96/liquidscript/badge.png?branch=master)](https://coveralls.io/r/redjazz96/liquidscript?branch=master) [![Code Climate](https://codeclimate.com/github/redjazz96/liquidscript.png)](https://codeclimate.com/github/redjazz96/liquidscript)
+[![Build Status](http://img.shields.io/travis/redjazz96/liquidscript.svg)](https://travis-ci.org/redjazz96/liquidscript) [![Coverage Status](http://img.shields.io/coveralls/redjazz96/liquidscript.svg)](https://coveralls.io/r/redjazz96/liquidscript?branch=master) [![Code Climate](http://img.shields.io/codeclimate/github/redjazz96/liquidscript.svg)](https://codeclimate.com/github/redjazz96/liquidscript) [![Gem Version](http://img.shields.io/gem/v/liquidscript.svg)](http://badge.fury.io/rb/liquidscript) [![Dependencies](http://img.shields.io/gemnasium/redjazz96/liquidscript.svg)](https://gemnasium.com/redjazz96/liquidscript) [![License](http://img.shields.io/badge/license-MIT-brightgreen.svg)](http://choosealicense.com/licenses/mit/)
 
 A javascript-based language that compiles to javascript.
 

data/bin/lscript

@@ -8,10 +8,16 @@ if ARGV.length < 1
 end
 
 infile = ARGV.shift
-outfile = ARGV.shift || infile.gsub(/\.ls\Z/, ".js")
+outfile = ARGV.shift || infile.gsub(/\.liq\Z/, ".js")
 
 File.open(infile, "r") do |f|
-  out = Liquidscript::Template.new(f.read).render
 
-  File.open(outfile, "w") { |o| o.write out }
+  begin
+    out = Liquidscript::Template.new(f.read).render
+    File.open(outfile, "w") { |o| o.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
+
 end

data/lib/liquidscript/compiler/base.rb

@@ -17,8 +17,9 @@ module Liquidscript
       #   the #each function returns an Enumerator, which yields
       #   {Scanner::Token}s.
       def initialize(scanner)
-        @scanner = scanner.each
-        @action  = Action.new
+        @scanner  = scanner
+        @iterator = scanner.each
+        @action   = Action.new
         reset!
       end
 
@@ -71,7 +72,7 @@ module Liquidscript
       #
       # @return [#type?, Blank]
       def pop
-        @scanner.next
+        @iterator.next
       rescue StopIteration
         scanner_nil
       end
@@ -82,7 +83,7 @@ module Liquidscript
       #
       # @return [#type, Blank]
       def peek
-        @scanner.peek
+        @iterator.peek
       rescue StopIteration
         scanner_nil
       end
@@ -91,7 +92,7 @@ module Liquidscript
       #
       # @return [void]
       def reset!
-        @scanner.rewind
+        @iterator.rewind
       end
 
       alias_method :rewind, :reset!

data/lib/liquidscript/compiler/icr.rb

@@ -15,6 +15,13 @@ module Liquidscript
       include Classes
       include Helpers
 
+      # (see Base#initialize)
+      def initialize(*)
+        super
+
+        handle_directives
+      end
+
       # (see Base#reset!)
       def reset!
         @top         = Liquidscript::ICR::Set.new
@@ -34,6 +41,22 @@ module Liquidscript
       def compile_start
         compile_expression
       end
+
+      private
+
+      def handle_directives
+        return unless @scanner.metadata[:directives]
+
+        @scanner.metadata[:directives].each do |meta|
+          case meta[:command]
+          when "allow"
+            variables = meta[:args].split(' ')
+            variables.each { |v| top.context.allow(v.intern) }
+          else
+            raise UnknownDirectiveError.new(meta[:command])
+          end
+        end
+      end
     end
   end
 end

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

@@ -24,6 +24,7 @@ module Liquidscript
                        :newline,
                        :istring_begin,
                        :iheredoc_begin,
+                       :plus, :minus,
                        :lbrace   => :object,
                        :lbrack   => :array,
                        :arrow    => :function,
@@ -34,7 +35,7 @@ module Liquidscript
                         :heredoc, :iheredoc
                        ]         => :heredoc
 
-          if peek? :binop
+          if peek? :binop, :minus, :plus
             compile_binop(out)
           elsif peek? :prop
             compile_property(out)
@@ -43,8 +44,21 @@ module Liquidscript
           end
         end
 
+        def compile_minus
+          shift :minus
+
+          code :neg, compile_vexpression
+        end
+
+        def compile_plus
+          shift :plus
+
+          code :pos, compile_vexpression
+        end
+
         def compile_binop(left)
-          code :binop, shift(:binop), left, compile_vexpression
+          code :binop, shift(:binop, :minus, :plus), left,
+            compile_vexpression
         end
 
         def compile_unop
@@ -58,12 +72,13 @@ module Liquidscript
         # @return [ICR::Code]
         def compile_assignment(identifier)
           shift :equal
-          value    = compile_vexpression
 
           if identifier.type == :identifier
             variable = set(identifier)
+            value    = compile_vexpression
             variable.value = value
           else
+            value    = compile_vexpression
             variable = identifier
           end
 
@@ -90,6 +105,17 @@ module Liquidscript
             components << compile_vexpression
           end
 
+          ident = action do |i|
+            if peek?(:comma)
+              maybe_func = 2
+              components << i
+            elsif peek?(:rparen)
+              components << i
+            else
+              components << compile_identifier(i)
+            end
+          end
+
           loop do
           case maybe_func
           when 0
@@ -98,7 +124,7 @@ module Liquidscript
           when 1
             expect :rparen => action.end_loop,
               :comma       => action { maybe_func = 2 },
-              :identifier  => action { |i| components << i },
+              :identifier  => ident,
               :_           => expression
           when 2
             expect :rparen => action.end_loop,

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

@@ -42,6 +42,9 @@ module Liquidscript
                  :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          }
         end

data/lib/liquidscript/errors.rb

@@ -14,6 +14,12 @@ module Liquidscript
     end
   end
 
+  class UnknownDirectiveError < CompileError
+    def initialize(directive)
+      super "Unkown directive: #{directive}"
+    end
+  end
+
   class UnexpectedError < CompileError
     def initialize(expected, got)
       @expected = expected

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

@@ -21,11 +21,15 @@ module Liquidscript
         end
 
         def generate_op(code)
-          if code[1].type == :identifier
-            "#{code[1].value}#{code[2].value}"
-          else
-            "#{replace(code[1])}#{code[2].value}"
-          end
+          "#{replace(code[1])}#{code[2].value}"
+        end
+
+        def generate_neg(code)
+          "-#{replace(code[1])}"
+        end
+
+        def generate_pos(code)
+          "+#{replace(code[1])}"
         end
 
         def generate_while(code)
@@ -110,6 +114,10 @@ module Liquidscript
           " #{replace(code[2])} #{op} #{replace(code[3])}"
         end
 
+        def generate_identifier(code)
+          code.value
+        end
+
         def generate_keyword(code)
           " #{code[1].value} "
         end
@@ -153,11 +161,10 @@ module Liquidscript
             "function("                  <<
             code[1].parameters.join(',') <<
             ") {\n"                      <<
-            replace(code[1])             <<
-            '}'
-
+            replace(code[1])
           unindent!
-          function
+
+          function << indent_level << "}"
         end
       end
     end

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

@@ -20,12 +20,7 @@ module Liquidscript
         end
 
         def generate_access(code)
-          case code[1].type
-          when :identifier
-            "#{code[1].value}[#{replace code[2]}]"
-          else
-            "#{replace code[1]}[#{replace code[2]}]"
-          end
+          "#{replace code[1]}[#{replace code[2]}]"
         end
 
         def generate_get(code)

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

@@ -12,12 +12,7 @@
           args = buffer
           args.set_join! ','
 
-          case code[1].type
-          when :identifier
-            call << "#{code[1].value}"
-          else
-            call << "#{replace(code[1])}"
-          end
+          call << "#{replace(code[1])}"
 
           code[2..-1].inject(args) do |b, arg|
             b << replace(arg)
@@ -30,8 +25,6 @@
           prop = buffer
 
           case code[1].type
-          when :identifier
-            prop << code[1].value
           when :variable
             prop << code[1].name
           else

data/lib/liquidscript/icr/context.rb

@@ -1,3 +1,5 @@
+require "hashie"
+
 module Liquidscript
   module ICR
 
@@ -64,6 +66,15 @@ module Liquidscript
         end
       end
 
+      # Allows a specific variable to be used - but doesn't define it
+      # in the current context.
+      #
+      # @param name [Symbol]
+      # @return [void]
+      def allow(name)
+        allowed_variables << name
+      end
+
       # All of the parameter variables.
       #
       # @return [Array<Variable>]

data/lib/liquidscript/scanner/base.rb

@@ -25,11 +25,14 @@ module Liquidscript
 
       end
 
+      attr_accessor :metadata
+
       def initialize(source)
-        @source  = source
-        @scanner = StringScanner.new(@source)
-        @tokens  = []
-        @_scan   = nil
+        @source   = source
+        @scanner  = StringScanner.new(@source)
+        @tokens   = []
+        @_scan    = nil
+        @metadata = {}
       end
 
       def contexts

data/lib/liquidscript/scanner/liquidscript.rb

@@ -11,9 +11,9 @@ module Liquidscript
 
         context :main do
           set :number, %r{
-            -? [1-9][0-9]*     # the base of the number
-            (\.[0-9]+)?        # decmial portion, if needed
-            ([eE][+-]?[0-9]+)? # scientific notation
+            -? ([1-9][0-9]* | 0) # the base of the number
+            (\.[0-9]+)?          # decmial portion, if needed
+            ([eE][+-]?[0-9]+)?   # scientific notation
           }x
 
           set :string, %r{
@@ -39,12 +39,12 @@ module Liquidscript
           )
 
           set :binops, %w(
-            + - * / ^
+            * / ^
             << >> >>>
-            == ===
-            != !==
-            > >=
-            < <=
+            === ==
+            !== !=
+            >= >
+            <= <
             && ||
             & |
             instanceof
@@ -86,6 +86,8 @@ module Liquidscript
           on(":")         {     emit :colon         }
           on(".")         {     emit :prop          }
           on(",")         {     emit :comma         }
+          on("-")         {     emit :minus         }
+          on("+")         {     emit :plus          }
           on("\n")        {     line!               }
           on(%r{"} => :istring)
           on(%r{<<([A-Z]+)}) do |_, s|
@@ -104,6 +106,12 @@ module Liquidscript
           on(:unops)      { |m| emit :unop,    m    }
           on(:identifier) { |m| emit :identifier, m }
 
+          on(%r{#! ([A-Za-z]+) ?(.*?)\n}) do |_, c, a|
+            metadata[:directives] ||= []
+            metadata[:directives].push :command => c,
+                                       :args    => a
+          end
+
           on(%r{#.*?\n}) { }
           on(%r{\s})     { }
           on(:_)         { |m| error }

data/lib/liquidscript/version.rb

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

data/spec/fixtures/underscore.js

@@ -1,22 +1,39 @@
 (function() {
-  var root,previousUnderscore,breaker,ArrayProto,ObjProto,FuncProto,push,slice,concat,toString,hasOwnProperty,_;
+
+  var root,breaker,previousUnderscore,ArrayProto,ObjProto,FuncProto,push,slice,concat,toString,hasOwnProperty,nativeForEach,nativeMap,nativeReduce,nativeReduceRight,nativeFilter,nativeEvery,nativeSome,nativeIndexOf,nativeLastIndexOf,nativeIsArray,nativeKeys,nativeBind,_,each;
   root = this;
-  previousUnderscore = root._;
   breaker = {};
-  ArrayProto = root.Array.prototype;
-  ObjProto = root.Object.prototype;
-  FuncProto = root.Function.prototype;
+  previousUnderscore = root._;
+  console = root;
+  ArrayProto = Array.prototype;
+  ObjProto = Object.prototype;
+  FuncProto = Function.prototype;
   push = ArrayProto.push;
   slice = ArrayProto.slice;
   concat = ArrayProto.concat;
   toString = ObjProto.toString;
   hasOwnProperty = ObjProto.hasOwnProperty;
-    _ = _ || function _() {
-    if(this.initialize) {
-      this.initialize.apply(this, arguments);
-    }
-  }
-;
+  nativeForEach = ArrayProto.forEach;
+  nativeMap = ArrayProto.map;
+  nativeReduce = ArrayProto.reduce;
+  nativeReduceRight = ArrayProto.reduceRight;
+  nativeFilter = ArrayProto.filter;
+  nativeEvery = ArrayProto.every;
+  nativeSome = ArrayProto.some;
+  nativeIndexOf = ArrayProto.indexOf;
+  nativeLastIndexOf = arrayProto.lastIndexOf;
+  nativeIsArray = Array.isArray;
+  nativeKeys = Object.keys;
+  nativeBind = FuncProto.bind;
+  _ = function(obj) {
+    if( obj instanceof _) {
+       return obj;
+    };
+    if( ! ( this instanceof _)) {
+       return  new _(obj);
+    };
+    this._wrapped = obj;
+  };
   if( typeof  exports !== 'undefined') {
     if( typeof  root.module !==  'undefined' && root.module.exports) {
       exports = root.module.exports = _;
@@ -26,4 +43,46 @@
     root._ = _;
   };
   _.VERSION = "1.6.0";
+  each = _.each = _.forEach = function(obj,iterator,context) {
+
+    var i,length,keys;
+    if( obj ===  null ) {
+       return obj;
+    };
+    if( nativeForEach &&  obj.forEach === nativeForEach) {
+      obj.forEach(iterator,context);
+    }else if( obj.length === (+obj.length)) {
+      i = 0;
+      length = obj.length;
+      for(i = 0; i < length;i++) {
+      if( iterator.call(context,obj[i],i,obj) === breaker) {
+         return  null ;
+      };
+      };
+    } else {
+      keys = _.keys(obj);
+      length = keys.length;
+      for(i = 0; i < length;i++) {
+      if( iterator.call(context,obj[keys[i]],keys[i],obj) === breaker) {
+         return  null ;
+      };
+      };
+    };
+     return obj;
+  };
+  _.map = _.collect = function(obj,iterator,context) {
+
+    var results;
+    results = [];
+    if( obj ==  null ) {
+       return results;
+    };
+    if( nativeMap &&  obj.map === nativeMap) {
+       return obj.map(iterator,context);
+    };
+    each(obj,function(value,index,list) {
+      results.push(iterator.call(context,value,index,list));
+    });
+     return results;
+  };
 }).call();

data/spec/fixtures/underscore.liq

@@ -0,0 +1,100 @@
+(-> {
+
+  #! allow Array Object Function
+
+  root               = this
+  breaker            = {}
+  previousUnderscore = root._
+  console = root
+
+  ArrayProto = Array.prototype
+  ObjProto   = Object.prototype
+  FuncProto  = Function.prototype
+
+  push           = ArrayProto.push
+  slice          = ArrayProto.slice
+  concat         = ArrayProto.concat
+  toString       = ObjProto.toString
+  hasOwnProperty = ObjProto.hasOwnProperty
+
+  nativeForEach     = ArrayProto.forEach
+  nativeMap         = ArrayProto.map
+  nativeReduce      = ArrayProto.reduce
+  nativeReduceRight = ArrayProto.reduceRight
+  nativeFilter      = ArrayProto.filter
+  nativeEvery       = ArrayProto.every
+  nativeSome        = ArrayProto.some
+  nativeIndexOf     = ArrayProto.indexOf
+  nativeLastIndexOf = arrayProto.lastIndexOf
+  nativeIsArray     = Array.isArray
+  nativeKeys        = Object.keys
+  nativeBind        = FuncProto.bind
+
+  _ = (obj)-> {
+    if(obj instanceof _) {
+      return obj
+    }
+    if(!(this instanceof _)) {
+      return new _(obj)
+    }
+
+    this._wrapped = obj
+  }
+
+  if(typeof exports != 'undefined) {
+    if(typeof root.module != 'undefined && root.module.exports) {
+      exports = root.module.exports = _
+    }
+
+    exports._ = _
+  } else {
+    root._ = _
+  }
+
+  _.VERSION = "1.6.0"
+
+  each = _.each = _.forEach = (obj, iterator, context)-> {
+    if(obj == null) {
+      return obj
+    }
+    if(nativeForEach && obj.forEach == nativeForEach) {
+      obj.forEach(iterator, context)
+    } elsif(obj.length == (+obj.length)) {
+      i = 0
+      length = obj.length
+      for(i = 0, i < length, i++) {
+        if(iterator.call(context, obj[i], i, obj) == breaker) {
+          return null
+        }
+      }
+    } else {
+      keys = _.keys(obj)
+      length = keys.length
+      for(i = 0, i < length, i++) {
+        if(iterator.call(context, obj[keys[i]], keys[i], obj) == breaker) {
+          return null
+        }
+      }
+    }
+
+    return obj
+  }
+
+  _.map = _.collect = (obj, iterator, context)-> {
+    results = []
+    if(obj === null) {
+      return results
+    }
+
+    if(nativeMap && obj.map == nativeMap) {
+      return obj.map(iterator, context)
+    }
+
+    each(obj, (value, index, list)-> {
+      results.push(iterator.call(context, value, index, list))
+    })
+
+    return results
+  }
+
+}).call()

data/spec/liquidscript/compiler/icr_spec.rb

@@ -7,6 +7,7 @@ describe Compiler::ICR do
     iterator = double("iterator")
     scanner = double("scanner")
 
+    allow(scanner).to receive(:metadata).and_return({})
     expect(scanner).to receive(:each).once.and_return(iterator)
     allow(iterator).to receive(:next).and_return([
       Scanner::Token.new(:number, "32", 0, 0),
@@ -138,4 +139,40 @@ describe Compiler::ICR do
       end
     end
   end
+
+  describe "invalid directives" do
+    let(:scanner) do
+      scanner = double("scanner")
+      iterator = double("iterator")
+      allow(iterator).to receive(:rewind)
+
+      expect(scanner).to receive(:each).once.and_return(iterator)
+      expect(scanner).to receive(:metadata).twice.and_return(
+        {:directives =>
+          [{:command => "test", :args => ""},
+           {:command => "allow", :args => "test"}]})
+      scanner
+    end
+
+    it "raises an error" do
+      expect { subject }.to raise_error(Liquidscript::UnknownDirectiveError)
+    end
+  end
+
+  describe "directives" do
+    let(:scanner) do
+      scanner = double("scanner")
+      iterator = double("iterator")
+      allow(iterator).to receive(:rewind)
+
+      expect(scanner).to receive(:each).once.and_return(iterator)
+      expect(scanner).to receive(:metadata).twice.and_return(
+        {:directives => [{:command => "allow", :args => "test"}]})
+      scanner
+    end
+
+    it "raises an error" do
+      subject.top.context.get(:test)
+    end
+  end
 end

data/spec/liquidscript/scanner/lexer_spec.rb

@@ -73,5 +73,10 @@ describe Liquidscript::Scanner::Liquidscript, :lexer_helper do
         [:heredoc, "in heredoc"]
       ]
     end
+
+    describe "scanning directives" do
+      subject { c = described_class.new("#! test thing\n"); c.scan; c }
+      its(:metadata) { should eq :directives => [{:command => "test", :args => "thing"}] }
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: liquidscript
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors:
 - Jeremy Rodi
@@ -174,7 +174,7 @@ files:
 - spec/fixtures/string.compile.yml
 - spec/fixtures/string.generate.yml
 - spec/fixtures/underscore.js
-- spec/fixtures/underscore.ls
+- spec/fixtures/underscore.liq
 - spec/liquidscript/buffer_spec.rb
 - spec/liquidscript/compiler/icr_spec.rb
 - spec/liquidscript/generator/javascript_spec.rb
@@ -233,7 +233,7 @@ test_files:
 - spec/fixtures/string.compile.yml
 - spec/fixtures/string.generate.yml
 - spec/fixtures/underscore.js
-- spec/fixtures/underscore.ls
+- spec/fixtures/underscore.liq
 - spec/liquidscript/buffer_spec.rb
 - spec/liquidscript/compiler/icr_spec.rb
 - spec/liquidscript/generator/javascript_spec.rb

data/spec/fixtures/underscore.ls

@@ -1,30 +0,0 @@
-(-> {
-  root = this
-  previousUnderscore = root._
-  breaker = {}
-  ArrayProto = root.Array.prototype
-  ObjProto = root.Object.prototype
-  FuncProto = root.Function.prototype
-
-  push = ArrayProto.push
-  slice = ArrayProto.slice
-  concat = ArrayProto.concat
-  toString = ObjProto.toString
-  hasOwnProperty = ObjProto.hasOwnProperty
-
-  class _ {
-
-  }
-
-  if(typeof exports != 'undefined) {
-    if(typeof root.module != 'undefined && root.module.exports) {
-      exports = root.module.exports = _
-    }
-
-    exports._ = _
-  } else {
-    root._ = _
-  }
-
-  _.VERSION = "1.6.0"
-}).call()