liquidscript 0.9.2 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: de4a6e4e30f2ba12fbd6acd8e61710c6f3d730a0
-  data.tar.gz: 28f06c96c546b9acce2cb1a2454dddf36063734b
+  metadata.gz: 37763a0403a2c5970ed9af12838e06cd201098e7
+  data.tar.gz: 2f685296ac6651a7caf0cb4d632363ea60e31adb
 SHA512:
-  metadata.gz: f9b1a7c09cdaa877e8f87b3ba3df38c43a3cc159841ded598c6f414e9b201b496674e30615580341ab58bea73f16a86454e91c8608d729006938def214b9d2ea
-  data.tar.gz: 0583b8399b2af491b2d9c44fd05ac7dfe824f1e5da99e3d6a5ddf1f983591283c71e520883803da4b0e9e90888aa714ab08a568b41a6152b2843f15b2ea48881
+  metadata.gz: 8ff68b0b6dd56458726509b4e1a9660ea25ce7324d2bee3fee6b51f8a0d9dbe456085c6ef2e588c4cb56185c062160a3ff0e104075d335d2263e19c308aa8e54
+  data.tar.gz: e9655c95acdfb55f8b4da23ddbb66daffb3bf0ac9fd91633e3c62a27b896c7411340de41ea6c6de876d7762bd1a3471bdc13025143f9f36c82112d5f5dc52a21

data/lib/liquidscript/compiler/icr.rb

@@ -29,6 +29,7 @@ module Liquidscript
         @top         = Liquidscript::ICR::Set.new
         @top.context = Liquidscript::ICR::Context.new
         @set         = [@top]
+        @classes     = {}
         super
       end
 
@@ -50,10 +51,14 @@ module Liquidscript
         return unless @scanner.metadata[:directives]
 
         @scanner.metadata[:directives].each do |meta|
-          case meta[:command]
+          case meta[:command].downcase
           when "allow"
             variables = meta[:args].split(' ')
             variables.each { |v| top.context.allow(v.intern) }
+          when "cvar"
+            variables = meta[:args].split(' ')
+            variables.each { |v| top.context.set(v.intern,
+                                 :class => true).parameter! }
           else
             raise UnknownDirectiveError.new(meta[:command])
           end

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

@@ -12,12 +12,24 @@ module Liquidscript
           if peek?(:colon)
             shift :colon
             inherit = shift :identifier
-            ref inherit
+            inherit = ref(inherit)
           end
 
+          new_context = Liquidscript::ICR::Context.new
+          new_context.parents << top.context
+          new_context.class!
+          @classes[name.value] = new_context
+
+          new_context.parents << @classes[inherit.name.to_s] if inherit
+
+          top.context = new_context
           body = _compile_class_body(false)
 
-          code :class, name, inherit, body
+          new_context.undefined.each do |f|
+            raise f[1]
+          end
+
+          code :class, name, inherit, body, top.contexts.pop
         end
 
         def compile_module
@@ -67,6 +79,10 @@ module Liquidscript
           item = compile_property(item) if item.type == :identifier &&
             peek?(:prop) && !mod
 
+          if item.type == :identifier && !mod
+            set(item)
+          end
+
           shift :colon
           item
         end

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

@@ -11,9 +11,7 @@ module Liquidscript
           end
 
           # Just in case there is a property named 'class' or 'module'
-          v = expect [:identifier, :class, :module] => property
-
-          v
+          expect [:identifier, :class, :module] => property
         end
 
         def compile_access(body)
@@ -21,9 +19,7 @@ module Liquidscript
           key = compile_vexpression
           shift :rbrack
 
-          v = code :access, body, key
-
-          v
+          code :access, body, key
         end
 
         def compile_call(subject)
@@ -36,8 +32,7 @@ module Liquidscript
           arguments = collect_compiles :expression, :rparen,
             :comma => action.shift
 
-          call = code :call, subject, *arguments
-          call
+          code :call, subject, *arguments
         end
 
 
@@ -60,10 +55,10 @@ module Liquidscript
 
         private
 
-        def _build_set(parameters)
+        def _build_set(parameters = [])
           expressions = Liquidscript::ICR::Set.new
           expressions.context = Liquidscript::ICR::Context.new
-          expressions.context.parent = top.context
+          expressions.context.parents << top.context
           expressions[:arguments] = parameters
           @set << expressions
 

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

@@ -20,7 +20,7 @@ module Liquidscript
             shift :lbrace
             collect_compiles(:expression, :rbrace)
           else
-            compile_expression
+            [compile_expression]
           end
         end
 
@@ -30,6 +30,7 @@ module Liquidscript
                  :equal  => action { compile_assignment(v) },
                  :prop   => action { compile_property(v)   },
                  :lbrack => action { compile_access(v)     },
+                 :range  => action { |_| compile_range(v)  },
                  [:binop,
                   :minus,
                   :plus] => action { compile_binop(v)      },

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

@@ -4,15 +4,16 @@ module Liquidscript
       module Literals
 
         def compile_number
-          #code :number, pop.value
           n = shift(:number)
 
-          if peek?(:prop)
-            shift(:prop)
-            shift(:prop)
-            n2 = shift(:number)
+          if peek?(:range)
+            shift(:range)
 
-            code :range, n.value, n2.value
+            if peek?(:number)
+              code :nrange, n.value, shift(:number).value
+            else
+              compile_range(code(:number, n.value))
+            end
           else
             code :number, n.value
           end
@@ -22,6 +23,10 @@ module Liquidscript
           code :action, shift(:action)
         end
 
+        def compile_range(subject)
+          code :range, subject, compile_vexpression
+        end
+
         def compile_while
           shift :while
           shift :lparen
@@ -46,6 +51,7 @@ module Liquidscript
           end
         end
 
+
         def _compile_for_in(ident)
           content = shift :identifier
           unless content.value == "in"
@@ -55,9 +61,9 @@ module Liquidscript
           obj = shift :identifier
           shift :rparen
 
-          set ident
+          v = set(ident)
           body = _compile_block
-          code :for_in, ident, ref(obj), body
+          code :for_in, v, ref(obj), body
         end
 
         def _compile_for_seg(first)
@@ -73,9 +79,11 @@ module Liquidscript
         end
 
         def compile_identifier(identifier)
-          ref(identifier) unless peek?(:equal)
-
-          identifier
+          if peek?(:equal)
+            identifier
+          else
+            ref(identifier)
+          end
         end
 
         def compile_regex

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

@@ -9,18 +9,33 @@ module Liquidscript
           "!="  => "!==",
           "!==" => "!=",
           "or"  => "||",
-          "and" => "&&"
+          "and" => "&&",
+          "is"  => "===",
+          "isnt"=> "!=="
         }.freeze
 
         def generate_number(code)
           "#{code.first}"
         end
 
-        def generate_range(code)
+        def generate_nrange(code)
           start  = code[1]
           ending = code[2]
 
-          (start..ending).to_a.join(', ')
+          buffer << "[" << (start..ending).to_a.join(', ') << "]"
+        end
+
+        def generate_range(code)
+          out = buffer
+          out << "(function(a, b) {\n"                          <<
+                 indent!   << "var out, i;\n"                   <<
+                 indent    << "for(i = a; i <= b; i++) {\n"     <<
+                 indent!   << "out.push(i);\n"                  <<
+                 unindent! << "};\n"                            <<
+                 indent    << "return out;\n"                   <<
+                 unindent! << "})(" << replace(code[1]) << ", " <<
+                 replace(code[2]) << ")"
+          out
         end
 
         def generate_action(code)
@@ -48,11 +63,11 @@ module Liquidscript
 
         def generate_for_in(code)
           loop_body = buffer
-          loop_body << "for(#{code[1].value} in #{code[2].name}) {\n"
+          loop_body << "for(#{code[1].to_s} in #{code[2].name}) {\n"
           indent!
           insert_into(code[3], loop_body)
           unindent!
-          loop_body << indent_level << "}"
+          loop_body << indent << "}"
         end
 
         def generate_for_seg(code)
@@ -132,8 +147,12 @@ module Liquidscript
           "#{replace(code[2])} #{op} #{replace(code[3])}"
         end
 
-        def generate_identifier(code)
-          code.value
+        #def generate_identifier(code)
+        #  code.value
+        #end
+
+        def generate_variable(code)
+          code.to_s
         end
 
         def generate_keyword(code)

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

@@ -26,7 +26,9 @@ module Liquidscript
 
           case code[1].type
           when :variable
-            prop << code[1].name
+            prop << code[1].to_s
+          when :identifier
+            prop << code[1].value
           else
             prop << replace(code[1])
           end
@@ -38,7 +40,7 @@ module Liquidscript
           _context :name        => code[1].value,
                    :inherit     => code[2],
                    :parts       => code[3],
-                   :inheritance => "%{name}.prototype.__proto__  = %{inherit};\n",
+                   :inheritance => "%{name}.prototype.__proto__  = %{inherit}.prototype;\n",
                    :identifier  => "%{name}.prototype.%{value} = %{replace};\n",
                    :istring     => "%{name}.prototype[\"%{value}\"] = %{replace};\n",
                    :property    => "%{name}.%{value} = %{replace};\n",
@@ -83,7 +85,7 @@ module Liquidscript
             end
 
             if last_module
-              body << "#{last_module}.#{name} = #{name};\n"
+              body << indent << "#{last_module}.#{name} = #{name};\n"
             end
           end
 
@@ -100,13 +102,13 @@ module Liquidscript
             opts[:value] = k.value
             opts[:replace] = replace(v)
 
-            body << sprintf(options[k.type], opts)
+            body << indent << 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)
+              body << indent << sprintf(options[k.type], opts)
             else
               raise InvalidCodeError.new(k[1].value)
             end
@@ -118,11 +120,11 @@ module Liquidscript
         end
 
         def _build_header(body, options, opts)
-          body << sprintf(options[:head], opts)
+          body << indent << sprintf(options[:head], opts)
 
           if options[:inherit]
-            opts[:inherit] = options[:inherit].value
-            body << sprintf(options[:inheritance], opts)
+            opts[:inherit] = options[:inherit].to_s
+            body << indent << sprintf(options[:inheritance], opts)
           end
         end
 

data/lib/liquidscript/icr/context.rb

@@ -13,15 +13,21 @@ module Liquidscript
 
       # The variables that are allowed to be used as a global scope,
       # i.e. used in a `get` context without a previous `set`.
-      DEFAULT_ALLOWED_VARIABLES = [
-        :window, :global, :exports, :console, :this, :arguments,
-        :require
-      ]
+      DEFAULT_ALLOWED_VARIABLES = %w(
+        window global exports console this arguments
+        Infinity NaN undefined eval isFinite isNaN parseFloat
+        parseInt decodeURI decodeURIComponent encodeURI encodeURIComponent
+        Object Function Boolean Error EvalError InternalError RangeError
+        ReferenceError SyntaxError TypeError URIError Number Math
+        Date String  RegExp Array Float32Array Float64Array Int16Array
+        Int32Array Int8Array Uint16Array Uint32Array Uint8Array
+        Uint8ClampedArray ArrayBuffer DataView JSON Intl
+      ).map(&:intern)
 
       # The parent of the current context.
       #
       # @return [Parent]
-      attr_accessor :parent
+      attr_accessor :parents
 
       # The variables that are a part of this context.
       #
@@ -35,12 +41,16 @@ module Liquidscript
       # @return [Array<Symbol>]
       attr_reader :allowed_variables
 
+      attr_reader :undefined
+
       include Representable
 
       # Initializes the context.
       def initialize
+        @undefined = []
         @variables = {}
         @allowed_variables = [DEFAULT_ALLOWED_VARIABLES].flatten
+        @parents = []
       end
 
       # Returns a variable reference.  If checks the local variables
@@ -53,17 +63,9 @@ module Liquidscript
       # @param type [Symbol] the type of use.  Should be `:get` or
       #   `:set`.
       # @return [Variable]
-      def variable(name, type)
-        @variables.fetch(name) do
-          if type == :set
-            @variables[name] = Variable.new(self, name)
-          elsif allowed_variables.include?(name)
-            Variable.new(self, name)
-          elsif type == :get && parent
-            parent.get(name)
-          else
-            raise InvalidReferenceError.new(name)
-          end
+      def variable(name, type, options = {})
+        if [:get, :set].include?(type)
+          send(type, name, options = {})
         end
       end
 
@@ -86,21 +88,73 @@ module Liquidscript
       # (see #variable).
       #
       # Passes `:get` as type.
-      def get(name)
-        variable(name, :get)
+      def get(name, options = {})
+        @variables.fetch(name) do
+          case true
+          when allowed_variables.include?(name)
+            Variable.new(self, name)
+          when parents.any?
+            get_parent(name)
+          when @class
+            add_undefined(name)
+          else
+            raise InvalidReferenceError.new(name)
+          end
+        end
       end
 
       # (see #variable).
       #
       # Passes `:set` as type.
-      def set(name)
-        variable(name, :set)
+      def set(name, options = {})
+        @variables.fetch(name) do
+          @undefined.reject! { |(n, _)| n == name }
+          @variables[name] =
+            Variable.new(self, name,
+                         {:class => @class}.merge(options))
+        end
+      end
+
+      def class!
+        @class = true
+        self
       end
 
       def to_a
         @variables.keys
       end
 
+      private
+
+      def get_parent(name)
+        results = parents.map do |parent|
+          begin
+            parent.get(name)
+          rescue InvalidReferenceError => e
+            e
+          end
+        end.compact
+
+        where = results.detect { |i|
+          not i.is_a?(InvalidReferenceError) }
+
+        if where
+          where
+        else
+          error = results.first
+          if @class
+            add_undefined(name, error)
+          else
+            raise error
+          end
+        end
+      end
+
+      def add_undefined(name, e = InvalidReferenceError.new(name))
+        @undefined << [name, e]
+        Variable.new(self, name, :class => true)
+      end
     end
+
   end
 end

data/lib/liquidscript/icr/set.rb

@@ -18,19 +18,22 @@ module Liquidscript
       def initialize
         @metadata = {}
         @code = []
+        @contexts = []
         @action = :exec
       end
 
       #
       def context
-        @metadata.fetch(:context) do
-          @metadata.fetch(:parent).context
-        end
+        contexts.last || @metadata.fetch(:parent).context
+      end
+
+      def contexts
+        @contexts
       end
 
       #
       def context=(new_context)
-        @metadata[:context] = new_context
+        contexts << new_context
       end
 
       # Adds a code to the code list.  This is just a
@@ -89,11 +92,11 @@ module Liquidscript
       #
       # @return [Array]
       def to_a
-        [
-          @action,
-          *@metadata.to_a.map { |(m, i)| [:"_#{m}", i] },
-          *@code
-        ]
+        part = [@action]
+        part << [:_context, context] if contexts.any?
+        part.concat(@metadata.to_a.map { |(m, i)| [:"_#{m}", i] })
+        part.concat(@code)
+        part
       end
 
       # Outputs the codes in this set.

data/lib/liquidscript/icr/variable.rb

@@ -27,10 +27,11 @@ module Liquidscript
 
       include Representable
 
-      def initialize(context, name)
+      def initialize(context, name, options = {})
         @context = context
-        @name = name
-        @value = nil
+        @name    = name
+        @options = options
+        @value   = nil
       end
 
       # Make this class compatible with the #type based system.
@@ -57,6 +58,14 @@ module Liquidscript
         @parameter
       end
 
+      def to_s
+        if @options[:class]
+          "this.#{@name}"
+        else
+          @name
+        end
+      end
+
       # Turns the variable into an array.
       #
       # @return [Array<(Symbol, Symbol)>]

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

@@ -57,6 +57,7 @@ module Liquidscript
               & |
               instanceof
               or and
+              is isnt
             )
 
             set :keywords, %w(
@@ -124,6 +125,7 @@ module Liquidscript
             on(")")         {     emit :rparen        }
             on("]")         {     emit :rbrack        }
             on(":")         {     emit :colon         }
+            on("..")        {     emit :range         }
             on(".")         {     emit :prop          }
             on(",")         {     emit :comma         }
             on("-")         {     emit :minus         }

data/lib/liquidscript/version.rb

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

data/spec/fixtures/class.compile.yml

@@ -30,9 +30,11 @@ compiled:
                   - []
                 - - :_arguments
                   - []
+        - - :test
       - - :class
         - - :identifier
           - AnotherClass
-        - - :identifier
-          - SomeClass
+        - - :_variable
+          - :SomeClass
+        - []
         - []

data/spec/fixtures/class.generate.yml

@@ -1,24 +1,44 @@
 data: |
+  #! allow require
+
+  assert = require('assert)
+
   module Something {
     class Test {
-      wee: -> {
-        console.log(2)
-      }
+
+      some-number: 2
 
       initialize: -> {
         "this should be init"
+        wee()
+      }
+
+      wee: -> {
+        console.log(some-number)
       }
 
       this.test: -> {
         "class method!"
       }
     }
+
+
+    class AnotherTest : Test {
+      #! cvar another-thing
+      thing: -> {
+        console.log("[another test]", some-number, another-thing)
+      }
+    }
   }
 
+  assert.equal(new AnotherTest().some-number, 2)
+
   module.exports = Something
 
 compiled: |
-  var Something, Test;
+  var assert, Something, Test, AnotherTest;
+
+  assert = require('assert');
 
   Something = Something || {};
   Test = Test || function Test() {
@@ -27,17 +47,36 @@ compiled: |
     }
   };
 
-  Test.prototype.wee = function() {
-    console.log(2);
-  };
+  Test.prototype.someNumber = 2;
 
   Test.prototype.initialize = function() {
     "this should be init";
+    this.wee();
+  };
+
+  Test.prototype.wee = function() {
+    console.log(this.someNumber);
   };
 
   Test.test = function() {
     "class method!";
   };
-  Something.Test = Test;;
+  Something.Test = Test;
+
+  AnotherTest = AnotherTest || function AnotherTest() {
+    if(this.initialize) {
+      this.initialize.apply(this, arguments);
+    }
+  };
+
+  AnotherTest.prototype.__proto__ = Test.prototype;
+
+  AnotherTest.prototype.thing = function() {
+    console.log("[another test]", this.someNumber, this.anotherThing);
+  };
+
+  Something.AnotherTest = AnotherTest;;
+
+  assert.equal(new AnotherTest().someNumber, 2);
 
   module.exports = Something;

data/spec/fixtures/combination.generate.yml

@@ -1,4 +1,5 @@
 data: |
+  #! allow require
   Test = require("assert")
 
   module SomeModule {

data/spec/fixtures/function.generate.yml

@@ -2,10 +2,21 @@ data: |
   console = 2
   some_function = ()-> {
     console = 3
+    test = 0..console
   }
 
 compiled: |
   var some_function;
   console = 2;
 
-  some_function = function() { console = 3; };
+  some_function = function() {
+    var test;
+    console = 3;
+    test = (function(a, b) {
+      var out, i;
+      for(i = a; i <= b; i++) {
+        out.push(i);
+      };
+      return out;
+    })(0, console);
+  };

data/spec/fixtures/literals.generate.yml

@@ -1,7 +1,7 @@
 data: |
   object = { hello: "world" }
   test = [1, 2]
-  range = [0x1..0x9]
+  range = 0x1..0x9
   regex = r/^\/test/
   block = ///
     ^test # comment

data/spec/fixtures/main.compile.yml

@@ -19,21 +19,21 @@ compiled:
         - - :_arguments
           - []
         - - :for_in
-          - - :identifier
-            - v
+          - - :_variable
+            - :v
           - - :_variable
             - :console
           - - - :call
               - - :property
-                - - :identifier
-                  - console
+                - - :_variable
+                  - :console
                 - log
-              - - :identifier
-                - v
+              - - :_variable
+                - :v
         - - :call
           - - :property
-            - - :identifier
-              - console
+            - - :_variable
+              - :console
             - log
           - - :istring
             - hello world

data/spec/fixtures/string.compile.yml

@@ -19,15 +19,15 @@ compiled:
     - 1
   - - :call
     - - :property
-      - - :identifier
-        - console
+      - - :_variable
+        - :console
       - log
     - - :href
       - *heredoc
   - - :interop
     - - :istring_begin
       - "hello "
-    - - :identifier
-      - console
+    - - :_variable
+      - :console
     - - :istring
       - ""

data/spec/liquidscript/icr/context_spec.rb

@@ -24,7 +24,7 @@ describe ICR::Context do
 
     subject do
       context = ICR::Context.new
-      context.parent = parent
+      context.parents << parent
       context
     end
 

metadata

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