liquidscript 0.11.0.rc1 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3659bbe0464cee916b09fbfb082e40cbd630c63b
-  data.tar.gz: c7708c7a59d1b5ac56edecc2babcd545b21d8321
+  metadata.gz: 6c88d468f4ac01f88dc94196315f2b19f107eaa4
+  data.tar.gz: e7a78f612a4563d8e61f9700e24e6fb032e85d37
 SHA512:
-  metadata.gz: b0fb9dc4ef32911b666bc9914f64ae198e79be36f6dfad11814671717227d9e5b04b9cfd17868caa3ce40af91a81fe90a17e7333d1ecc4ff8eeb5a5391040364
-  data.tar.gz: 4323533b81a1fba55e715b89a5ffa3b8b369c8c46dce386fdf190fda4d4cb8ccf7204e406960848e7ad23a70ffdc765c74d156eb31b27e576d60a0ad7b8259a4
+  metadata.gz: 7fe74221dd6cffe7c26eaaa42a6c5f7fb9133624016fd983cdf03d0e5ebeb95790c4ef7ab552a61a1ab9ddd7c8946c2d96c18994516abf48ec249bc8d22a69fd
+  data.tar.gz: e223f22fca8701f39dcb1b55ce1e8328ce35f749406033a0e907d8c4c5dc6b8e2c5d143d2750ee192fc0ed63d85d76491c6dca54cb76d3872bbf70a3592c3ead

data/lib/liquidscript.rb

@@ -12,7 +12,7 @@ end
 
 module Liquidscript
   def self.compile(data, options = {})
-    scanner = Scanner::Liquidscript.new(data)
+    scanner = Scanner::Liquidscript.new(data, options[:file])
     if options[:tokens]
       return scanner.each.to_a.to_sexp
     end

data/lib/liquidscript/cli.rb

@@ -48,7 +48,7 @@ module Liquidscript
 
     def perform_compiliation(file, out)
       open_files(file, out) do |infile, outfile|
-        out = Liquidscript.compile(infile.read)
+        out = Liquidscript.compile(infile.read, :file => file)
         outfile.write(out)
       end
     end

data/lib/liquidscript/compiler/base.rb

@@ -47,6 +47,13 @@ module Liquidscript
         end
 
         top
+
+      rescue CompileError => e
+        token = peek
+        part = "#{File.expand_path(@scanner.metadata[:file])}" +
+          ":#{token.line}:#{token.column}: " +
+          "before #{token.type.to_s.upcase}"
+        raise e, e.message, [part, *e.backtrace]
       end
 
       # Checks to see if the given input compiles.

data/lib/liquidscript/compiler/base/blank.rb

@@ -12,6 +12,13 @@ module Liquidscript
           nil
         end
 
+        # We are nil.  Yay.
+        #
+        # @return [true]
+        def nil?
+          true
+        end
+
         # Tells Ruby that we respond to all methods.
         #
         # @return [true]

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

@@ -4,42 +4,50 @@ module Liquidscript
       module Classes
 
         def compile_class
-          shift :class
-          name = shift :identifier
-          inherit = nil
-          set name
-          # Inheritance ftw!
-          if peek?(:colon)
-            shift :colon
-            inherit = shift :identifier
-            inherit = ref(inherit)
+          delegate_if_class do
+            shift :class
+            name    = shift :identifier
+            inherit = nil
+            existed = check(name)
+            set(name)
+            # Inheritance ftw!
+            if peek?(:colon)
+              shift :colon
+              inherit = shift :identifier
+              inherit = ref(inherit)
+            end
+
+            @classes[name.value] =
+              expressions = Liquidscript::ICR::Set.new
+            expressions.context =
+              Liquidscript::ICR::Context.new.tap(&:class!)
+            expressions.parent = if inherit
+              @classes[inherit.name.to_s].tap { |t| t.parent = top }
+            else
+              top
+            end
+
+            @set << expressions
+            body = _compile_class_body(false)
+            expressions.context.force_defined!
+            out  = code(:class, name, inherit, body)
+            @set.pop
+            out[:existed] = existed
+            out
           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)
-
-          new_context.undefined.each do |f|
-            raise f[1]
-          end
-
-          code :class, name, inherit, body, top.contexts.pop
         end
 
         def compile_module
           m = shift :module
           if peek? :identifier
-            name = shift :identifier
-            set name
-            body = _compile_class_body(true)
-
-            code :module, name, body
+            name    = shift :identifier
+            existed = check(name)
+            set(name)
+            body    = _compile_class_body(true)
+
+            out           = code :module, name, body
+            out[:existed] = existed
+            out
           else
             value_expect _new_token(m, :identifier)
           end
@@ -86,6 +94,14 @@ module Liquidscript
           shift :colon
           item
         end
+
+        def delegate_if_class
+          if top.context.class?
+            top.context.delegate(&Proc.new)
+          else
+            yield
+          end
+        end
       end
     end
   end

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

@@ -40,7 +40,7 @@ module Liquidscript
 
           def directive_allow(*args)
             args.each do |a|
-              top.context.allow(a.value.intern)
+              top.context.set(a.value.intern).hidden!
             end
 
             nil
@@ -48,18 +48,56 @@ module Liquidscript
 
           def directive_cvar(*args)
             args.each do |a|
-              top.context.set(a.value.intern, :class => true).parameter!
+              top.context.set(a.value.intern, :class => true).hidden!
             end
 
             nil
           end
 
+          def directive_todo(comment)
+            $stderr.puts "TODO (file: #{@scanner.file}): #{comment[1]}"
+            nil
+          end
+
+          def directive_include(file)
+            file_name = file[1]
+            path = include_paths.find do |part|
+              File.file?(File.join(part, file_name))
+            end
+
+            raise LoadError,
+              "cannot load such file -- #{file}" unless path
+
+            full_path = File.join(path, file_name)
+            f         = File.open(full_path)
+            scanner   = Scanner::Liquidscript.new(f.read, full_path)
+            compiler  = Compiler::ICR.new(scanner)
+            compiler.top.parent = top
+            compiler.top.context.delegate!
+            compiler.compile
+          end
+
+          def directive_include_path(*paths)
+            include_paths.push(*paths.map(&:value))
+            nil
+          end
+
           def directive_strict
             top.metadata[:strict] = true
 
             nil
           end
 
+          private
+
+          def include_paths
+            @_include_paths ||= [
+              ".",
+              File.expand_path("../", @scanner.metadata[:file]),
+              *ENV.fetch("LIQUID_PATHS", "").split(':')
+            ]
+          end
+
         end
 
         def self.included(receiver)
@@ -67,8 +105,8 @@ module Liquidscript
           receiver.send :include, InstanceMethods
 
           InstanceMethods.instance_methods.each do |m|
-            if m.to_s =~ /\A_?directive_([A-Za-z0-9]+)\z/
-              receiver.define_directive($1, m)
+            if m.to_s =~ /\A_?directive_([A-Za-z0-9\_]+)\z/
+              receiver.define_directive($1.gsub(/\_[a-z]/) { |m| m[1].upcase }, m)
             end
           end
         end

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

@@ -121,20 +121,29 @@ module Liquidscript
             :command => command,
             :arguments => arguments }
 
-          @in_directive = old
 
-          if @in_directive
+          out = if old
             directive
           else
             handle_directive(directive)
           end
+
+          @in_directive = old
+          out
         end
 
         def _compile_lparen_method
           ident = shift :identifier
 
+          if peek?(:equal)
+            shift(:equal)
+            v = compile_vexpression
+          else
+            v = nil
+          end
+
           if peek?(:comma, :rparen)
-            _compile_lparen_method_final(ident)
+            _compile_lparen_method_final([ident, v])
           else
             out = value_expect(ref(ident))
             shift :rparen
@@ -145,12 +154,15 @@ module Liquidscript
 
         def _compile_lparen_method_final(ident = nil)
           components = [ident].compact
+          _build_set
+          set(ident[0]) if ident
 
-          while peek?(:comma) do
-            shift(:comma)
-            components << shift(:identifier)
+          while peek?(:comma)
+            components << _compile_lparen_argument
           end
 
+          @set.pop
+
           shift :rparen
           compile_function_with_parameters(components)
         end
@@ -161,6 +173,28 @@ module Liquidscript
           code :expression, out
         end
 
+        def _compile_lparen_argument
+          shift(:comma)
+
+          ident = shift(:identifier)
+          set(ident)
+
+          erange = action do |_|
+            if top[:etc]
+              raise CompileError,
+                "A drain argument has already been specified!"
+            end
+
+            top[:etc] = ident
+            :etc
+          end
+
+          value = expect :equal  => action { |_| compile_vexpression },
+                         :erange => erange, :_ => action { nil }
+
+          [ident, value]
+        end
+
       end
     end
   end

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

@@ -40,15 +40,7 @@ module Liquidscript
           shift :arrow
 
           expressions = _build_set(parameters)
-
-          if peek?(:lbrace)
-            shift :lbrace
-            collect_compiles(:rbrace) do
-              expressions << compile_expression
-            end
-          else
-            expressions << compile_expression
-          end
+          expressions.push(*_compile_block)
 
           code :function, @set.pop
         end
@@ -58,12 +50,16 @@ module Liquidscript
         def _build_set(parameters = [])
           expressions = Liquidscript::ICR::Set.new
           expressions.context = Liquidscript::ICR::Context.new
-          expressions.context.parents << top.context
+          expressions.context.parent = top.context
           expressions[:arguments] = parameters
           @set << expressions
 
           parameters.each do |parameter|
-            set(parameter).parameter!
+            if parameter[1] == :etc
+              set(parameter[0]).hidden!
+            else
+              set(parameter[0]).parameter!
+            end
           end
 
           expressions

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

@@ -54,7 +54,8 @@ module Liquidscript
 
         def compile_catch
           _compile_group(:catch, false, [:finally]) do
-            shift :identifier
+            ident = shift :identifier
+            set(ident).hidden!
           end
         end
 

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

@@ -11,6 +11,13 @@ module Liquidscript
           top.context.set(literal.value.intern)
         end
 
+        def check(literal)
+          top.context.get(literal.value.intern,
+            :dry_run => true)
+        rescue InvalidReferenceError
+          false
+        end
+
         def code(type, *args)
           Liquidscript::ICR::Code.new type, *args
         end
@@ -31,6 +38,7 @@ module Liquidscript
                  :prop   => action { compile_property(v)   },
                  :lbrack => action { compile_access(v)     },
                  :range  => action { |_| compile_range(v)  },
+                 :erange => action { |_| compile_erange(v) },
                  [:binop,
                   :minus,
                   :plus] => action { compile_binop(v)      },

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

@@ -6,13 +6,14 @@ module Liquidscript
         def compile_number
           n = shift(:number)
 
-          if peek?(:range)
-            shift(:range)
+          if peek?(:range, :erange)
+            range = shift(:range, :erange)
 
             if peek?(:number)
-              code :nrange, n.value, shift(:number).value
+              type = :"n#{range.type}"
+              code(type, n.value, shift(:number).value)
             else
-              compile_range(code(:number, n.value))
+              send(:"compile_#{range.type}", code(:number, n.value))
             end
           else
             code :number, n.value
@@ -27,6 +28,10 @@ module Liquidscript
           code :range, subject, compile_vexpression
         end
 
+        def compile_erange(subject)
+          code :erange, subject, compile_vexpression
+        end
+
         def compile_while
           shift :while
           shift :lparen

data/lib/liquidscript/errors.rb

@@ -26,7 +26,7 @@ module Liquidscript
   class UnexpectedError < CompileError
     def initialize(expected, got)
       @expected = expected
-      @got = got
+      @got      = got
 
       super build_error_message
     end
@@ -34,24 +34,25 @@ module Liquidscript
     private
 
     def build_error_message
-      str = "Expected one of %{expected}, got %{type}(%{value})"
+      str = "Expected one of %{expected}, got %{type}(%{value}) "
       hash = {
-        :expected => @expected.map { |e| e.to_s.upcase }.join(', ')
+        :expected => @expected.map { |e| ns(e) }.join(', ')
       }
 
       if @got.is_a? Symbol
-        hash[:type]  = @got.to_s.upcase
+        hash[:type]  = ns(@got)
         hash[:value] = ""
       else
-        str << " (line %{line}, column %{column})"
-        hash.merge! :type   => @got.type.to_s.upcase,
-                    :line   => @got.line,
-                    :column => @got.column,
+        hash.merge! :type   => ns(@got.type),
                     :value  => @got.value
       end
 
       sprintf(str, hash)
     end
+
+    def ns(sym)
+      sym.to_s.upcase
+    end
   end
 
   class InvalidCodeError < GeneratorError