liquidscript 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 93358b89fa051538828ed587aaa478796f993676
-  data.tar.gz: bf64eeb97bbdf9cb43150bf94b3d49d79bbba043
+  metadata.gz: 6e5b9fbac30bdea16bbd07de8b99ca913d320b6c
+  data.tar.gz: 888ba150e7957d376b2d1582b8ddd7d12a1d8ecc
 SHA512:
-  metadata.gz: e91ab8b884aa60ed0d52d12f793f0f0b0f0cb13d3fbd060ae9d0345a56ef693dd99560fb280a8d68ea28f63fdf14f4f6b0106fbd34bbf3b039dd4456d2705b92
-  data.tar.gz: 5bf5238837a656e9926809656fd90b3d96d768c6c589fd15886085852ec2e3fbc4e8963502ead086483a15cd0dea5f29bbdd0d5328d21c5e3eac2643bb9acba4
+  metadata.gz: c8d20ebc1d0dbdcf8398304d8e2a7e4a6e67eec0468189f42ee8f08e449151b2f9d3799e73ef9b4d9be25e7b4b083c0c625e3e2379c5d69c0bb5604c8eeaaf4c
+  data.tar.gz: e989b3f6b374a81c8e55b282570ecb6b6969a7250611addd042c6a8ce10bbb165be7cde3dbc1e43ca9c40276245236363e07dc7ca2c976f7e36a3df92ab996e9

data/.travis.yml

@@ -4,5 +4,4 @@ rvm:
   - 1.9.3
   - jruby-19mode
   - rbx
-before_script: bundle exec rake ls:ragel
 script: bundle exec rspec -f d spec

data/Guardfile

@@ -1,7 +1,3 @@
-guard :rake, :task => "ls:ragel" do
-  watch("lib/liquidscript/scanner/lexer.rl")
-end
-
 guard :rspec do
   watch(%r{^spec/.+_spec\.rb})
   watch(%r{^lib/(.+)\.rb})     { |m| "spec/lib/#{m[1]}_spec.rb" }

data/Rakefile

@@ -9,8 +9,8 @@ namespace :ls do
     sh "ragel -R #{t.source}"
   end
 
-  desc "Builds the ragel parser."
-  task :ragel => ["lib/liquidscript/scanner/lexer.rb"]
+  #desc "Builds the ragel parser."
+  #task :ragel => ["lib/liquidscript/scanner/lexer.rb"]
 
   desc "Opens up a pry session."
   task :pry => [:ragel] do

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

@@ -16,10 +16,11 @@ module Liquidscript
         # @return [ICR::Code]
         def compile_vexpression
           out = expect :number,     :identifier,
-                       :dstring,    :lparen,
+                       :istring,    :lparen,
                        :sstring,    :operator,
                        :keyword,    :unop,
                        :newline,
+                       :istring_begin,
                        :lbrack   => :object,
                        :lbrace   => :array,
                        :arrow    => :function

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

@@ -18,12 +18,26 @@ module Liquidscript
                  :_      => default
         end
 
-        def compile_dstring
-          code :dstring, pop.value[1..-2]
+        def compile_istring_begin
+          start = shift :istring_begin
+          contents = [start]
+
+          loop do
+            contents << compile_vexpression
+            contents << shift(:istring)
+            peek?(:istring_begin)
+          end
+
+
+          code :interop, *contents
+        end
+
+        def compile_istring
+          code :istring, shift(:istring).value
         end
 
         def compile_sstring
-          code :sstring, pop.value[1..-1]
+          code :sstring, shift(:sstring).value[1..-1]
         end
 
         def compile_operator

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

@@ -17,11 +17,27 @@ module Liquidscript
           "#{code.first}"
         end
 
-        def generate_dstring(code)
-
+        def generate_istring(code)
           "\"#{code.first.gsub("\n", "\\n")}\""
         end
 
+        def generate_interop(code)
+          content = code[1..-1]
+          buf = buffer
+          buf.set_join! ','
+
+          content.each do |part|
+            case part.type
+            when :istring_begin, :istring
+              buf << "\"#{part.value}\""
+            else
+              buf << "#{replace(part)}"
+            end
+          end
+
+          "[#{buf}].join('')"
+        end
+
         def generate_sstring(code)
 
           "'#{code.first.gsub(/'/, "\\'")}'"

data/lib/liquidscript/scanner.rb

@@ -1,40 +1,12 @@
 require "liquidscript/scanner/token"
-require "liquidscript/scanner/lexer"
+require "liquidscript/scanner/base"
+require "liquidscript/scanner/liquidscript"
 
 module Liquidscript
 
   # @todo Stream scanning.
   # um...
-  class Scanner
-
-    include Enumerable
-
-    def initialize(source)
-      @tokenizer = Lexer.new
-      @source = source
-    end
-
-    def each
-      e = buffer.each
-
-      if block_given?
-        e.each(&Proc.new)
-      else
-        e
-      end
-    end
-
-    def inspect
-      "#<#{self.class.to_s}:#{'0x%08x' % self.object_id}>"
-    end
-
-    private
-
-    def buffer
-      @_parts ||= begin
-        @tokenizer.perform(@source)
-      end
-    end
+  module Scanner
 
   end
 end

data/lib/liquidscript/scanner/base.rb

@@ -0,0 +1,84 @@
+require 'set'
+require 'strscan'
+require 'liquidscript/scanner/base/builder'
+require 'liquidscript/scanner/base/context'
+require 'liquidscript/scanner/base/dsl'
+require 'liquidscript/scanner/base/lexer'
+
+module Liquidscript
+  module Scanner
+    # TODO: documentation
+    class Base
+
+      EXIT = Object.new.freeze
+
+      include Lexer
+      include Enumerable
+
+      class << self
+
+        def contexts
+          @_contexts ||= Set.new
+        end
+
+        attr_accessor :default
+
+      end
+
+      def initialize(source)
+        @source  = source
+        @scanner = StringScanner.new(@source)
+        @tokens  = []
+        @_scan   = nil
+      end
+
+      def contexts
+        self.class.contexts
+      end
+
+      def default_context
+        self.class.default
+      end
+
+      def scan
+        lex default_context
+        self
+      end
+
+      def each
+        e = buffer.each
+
+        if block_given?
+          e.each(&Proc.new)
+        else
+          e
+        end
+      end
+
+      def line
+        "(unknown)"
+      end
+
+      def column
+        "(unkown)"
+      end
+
+      def emit(token_name, body = nil)
+        @tokens << Token.new(token_name, body, line, column)
+      end
+
+      def inspect
+        "#<#{self.class}:#{'0x%08x' % object_id}>"
+      end
+
+      private
+
+      def buffer
+        @_scan ||= begin
+          scan
+          @tokens
+        end
+      end
+    end
+  end
+end

data/lib/liquidscript/scanner/base/builder.rb

@@ -0,0 +1,38 @@
+require 'set'
+
+module Liquidscript
+  module Scanner
+    class Base
+      class Builder
+
+        EMPTY_VALUE = Object.new
+
+        attr_reader :contexts
+
+        def default_context(value = EMPTY_VALUE)
+          if value.equal? EMPTY_VALUE
+            @default_context
+          else
+            @default_context = value
+          end
+        end
+
+        def contexts
+          @contexts ||= Set.new
+        end
+
+        def context(name)
+          context = Context.new(name)
+          context.instance_exec(&Proc.new)
+          contexts << context
+        end
+
+        def reset!
+          @default_context = nil
+          @contexts = nil
+          self
+        end
+      end
+    end
+  end
+end

data/lib/liquidscript/scanner/base/context.rb

@@ -0,0 +1,83 @@
+module Liquidscript
+  module Scanner
+    class Base
+      class Context
+
+        attr_reader :name
+
+        def initialize(name)
+          @name = name
+          @matches = {}
+          @temps = {}
+        end
+
+        def find_matcher(with)
+          best_match = [0, nil, nil]
+          @matches.each do |k, v|
+            if with.match?(k) && with.matched_size > best_match[0]
+              best_match = [with.matched_size, k, v]
+            end
+          end
+
+          best_match[1..-1]
+        end
+
+        def exit
+          EXIT
+        end
+
+        def init
+          if block_given?
+            @init = Proc.new
+          else
+            @init || proc {}
+          end
+        end
+
+        def set(key, matcher)
+          @temps[key] = matcher
+        end
+
+        def get(key)
+          normalize_matcher @temps[key]
+        end
+
+        def on(matcher)
+          key = nil
+          value = nil
+
+          if block_given?
+            key = normalize_matcher matcher
+            value = Proc.new
+          else
+            key = normalize_matcher matcher.keys.first
+            value = matcher.values.first
+          end
+
+          @matches[key] = value
+        end
+
+        private
+
+        def normalize_matcher(matcher)
+          case matcher
+          when :_
+            /./m
+          when String
+            Regexp.new(Regexp.escape(matcher))
+          when Symbol
+            normalize_matcher(@temps[matcher])
+          when Array
+            union = matcher.map { |m|
+              Regexp.escape(m.to_s)
+            }.join('|')
+            Regexp.new "(#{union})"
+          else
+            matcher
+          end
+        end
+
+      end
+    end
+  end
+end

data/lib/liquidscript/scanner/base/dsl.rb

@@ -0,0 +1,27 @@
+module Liquidscript
+  module Scanner
+    class Base
+      module DSL
+
+        module ClassMethods
+
+          def define
+            builder.instance_exec(&Proc.new)
+            contexts.merge builder.contexts
+            self.default = builder.default_context
+            builder.reset!
+          end
+
+          def builder
+            @_builder ||= Builder.new
+          end
+
+        end
+
+        def self.included(base)
+          base.extend ClassMethods
+        end
+      end
+    end
+  end
+end

data/lib/liquidscript/scanner/base/lexer.rb

@@ -0,0 +1,80 @@
+module Liquidscript
+  module Scanner
+    class Base
+      module Lexer
+
+        def perform_with_context(context, scanner = @scanner)
+          key, value = context.find_matcher(scanner)
+
+          if value.nil? && scanner.rest?
+            error scanner
+          end
+
+          normalize_action key, value, scanner if scanner.rest?
+        end
+
+        def lex(argument)
+          context, body =
+          if argument.is_a?(Hash)
+            argument.to_a.first
+          else
+            argument
+          end
+
+          scanner = if body
+            StringScanner.new(body)
+          else
+            @scanner
+          end
+          out = []
+
+          context = find_context(context)
+          instance_exec &context.init
+
+          while scanner.rest? && out.last != EXIT
+            out << perform_with_context(context, scanner)
+          end
+
+          out
+        end
+
+        def error(scanner = @scanner)
+          raise SyntaxError, "Unexpected #{scanner.peek(2).inspect}" \
+            " (line: #{line}, column: #{column})"
+        end
+
+        private
+
+        def find_context(name)
+          context = contexts.dup.keep_if { |c|
+            c.name == name
+          }.to_a.first
+
+          if context.nil?
+            raise NoContextError.new(name)
+          end
+
+          context
+        end
+
+        def exit
+          EXIT
+        end
+
+        def normalize_action(key, value, scanner)
+          body = scanner.scan(key)
+
+          case value
+          when Proc
+            instance_exec(*body.match(key), &value)
+          when Symbol
+            lex value
+          when EXIT
+            EXIT
+          end
+        end
+
+      end
+    end
+  end
+end