liquidscript 0.1.5 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b993303ff76055d48e2917eb3dafc43eb42bbded
-  data.tar.gz: b58b4343a667bae9cd1291d6102be0c366d078ba
+  metadata.gz: 335eefd0c7fa9b7dcecb5de6e94162a43a7b828c
+  data.tar.gz: 8da6d806da9bb64dd0a83960e70c7ff845ca5488
 SHA512:
-  metadata.gz: d13485994da269958fee2b0fed2eb887a6e515cffaa40aa2b4f47e5ec946075bfa743a184160996680b91ddd6ba696747b61b4e9fc1a1b7d94b3ac8727586b3a
-  data.tar.gz: 8f4bc24c3c0e6dcb8b15c0b611b78228f659774c48082883f300399341d411c04fe0bf32044926d8e997df9a5e25dee2ae943128cb1bdc4bdb80a040d7a0168f
+  metadata.gz: f20c68ea5800a173dbe16aca753b86c313b2738b89ee5d5ec39edb8b44be8ff79210ebd473d7d475a10fd4cd8a7b156bfc2a083f1202d1eb2618f2a2e6e685ca
+  data.tar.gz: eef30426a1516cdb88ff954e384ec61937c977fd72e2f4287d0fd9871305ba4051afdc8dd7d3b988a076201e95bb780dce113d5e060e9a5c719134cf45615041

data/bin/lscript

@@ -13,5 +13,5 @@ outfile = ARGV.shift || infile.gsub(/\.ls\Z/, ".js")
 File.open(infile, "r") do |f|
   out = Liquidscript::Template.new(f.read).render
 
-  File.open(outfile, "w") { |f| f.write out }
+  File.open(outfile, "w") { |o| o.write out }
 end

data/lib/liquidscript/buffer.rb

@@ -13,6 +13,10 @@ module Liquidscript
       self
     end
 
+    def block(str)
+      append str.gsub(/^[ \t]+/, '')
+    end
+
     def set_join!(to)
       @_join = to
     end

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

@@ -3,25 +3,6 @@ module Liquidscript
     class Base
       module Helpers
 
-        module ClassMethods
-          def allowable
-            @_allowable ||= {}
-          end
-
-          def always(type)
-            case type
-            when Hash
-              allowable.merge!(type)
-            when Symbol
-              allowable[type] = type
-            end
-          end
-        end
-
-        def self.included(base)
-          base.extend ClassMethods
-        end
-
         # Normalizes an action for the hash passed to {#expect}.  If
         # a block is given, it returns that block.  If the argument is
         # a proc, it returns that proc.  If none of those conditions are
@@ -202,13 +183,9 @@ module Liquidscript
         # @return [Object] the result of the block/method call.
         def expect(*args)
           hash = normalize_arguments(args)
-          allowable = false
 
           block = hash.fetch(peek.type) do
-            hash.fetch(:_) do
-              allowable = true
-              self.allowable.fetch(peek.type)
-            end
+            hash.fetch(:_)
           end
 
           out = if block.arity == 1
@@ -217,11 +194,7 @@ module Liquidscript
             block.call
           end
 
-          if allowable
-            expect(*args)
-          else
-            out
-          end
+          out
 
         rescue KeyError
           raise UnexpectedError.new(hash.keys, peek)

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

@@ -6,18 +6,18 @@ module Liquidscript
         def compile_class
           shift :class
           name = shift :identifier
+          set name
           body = _compile_class_body(false)
 
-          set name
           code :class, name, body
         end
 
         def compile_module
           shift :module
           name = shift :identifier
+          set name
           body = _compile_class_body(true)
 
-          set name
           code :module, name, body
         end
 
@@ -34,7 +34,7 @@ module Liquidscript
           end
 
           loop do
-            expect :rbrack => action.end_loop,
+            expect :newline, :rbrack => action.end_loop,
             :comma         => action.shift,
             :module        => action { components << compile_module },
             :class         => action { components << compile_class  },

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

@@ -19,12 +19,13 @@ module Liquidscript
                        :dstring,    :lparen,
                        :sstring,    :operator,
                        :keyword,    :unop,
+                       :newline,
                        :lbrack   => :object,
                        :lbrace   => :array,
                        :arrow    => :function
 
           if peek? :binop
-            compile_binop out
+            compile_binop(out)
           elsif peek? :prop
             compile_property(out)
           else

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

@@ -65,6 +65,13 @@ module Liquidscript
           compile_function_with_parameters([])
         end
 
+        def compile_newline
+          if peek?(:newline)
+            pop
+            code :newline
+          end
+        end
+
         def compile_function_with_parameters(parameters)
           shift :arrow
           shift :lbrack
@@ -86,7 +93,7 @@ module Liquidscript
 
           loop do
             expect :rbrack => action.end_loop,
-              :_           => expression
+                   :_      => expression
           end
 
           code :function, @set.pop

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

@@ -67,6 +67,10 @@ module Liquidscript
           "[#{array}]"
         end
 
+        def generate_newline(_)
+          "\n"
+        end
+
         def generate_function(code)
 
           function = buffer

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

@@ -46,37 +46,45 @@ module Liquidscript
           class_name = code[1].value
 
           in_module(class_name) do |last_module|
-            body                                          <<
-              "#{class_name} = function #{class_name}(){" <<
-              "if(this.initialize) {"                     <<
-              "this.initialize.apply(this, arguments);"   <<
-              "}};"
+            body.block <<-JS
+              #{class_name} ||= function #{class_name}() {
+                if(this.initialize) {
+                  this.initialize.apply(this, arguments);
+                }
+              };
+            JS
 
-            code[2].each do |(k, v)|
+            code[2].each do |part|
+              k, v = part
               case k.type
               when :identifier
-                body                                      <<
-                  "#{class_name}.prototype.#{k.value} ="  <<
-                  replace(v) << ";"
+                body.block <<-JS
+                  #{class_name}.prototype.#{k.value} = #{replace(v)};
+                JS
               when :dstring
-                body                                      <<
-                  "#{class_name}.prototype[#{k.value}] =" <<
-                  replace(v) << ";"
+                body.block <<-JS
+                  #{class_name}.prototype[#{k.value}] = #{replace(v)};
+                JS
               when :property
                 if k[1].name != :this
                   raise InvalidCodeError.new(v[1].name)
                 end
 
-                body                                      <<
-                  "#{class_name}.#{k[2].value} = "        <<
-                  replace(v) << ";"
+                body.block <<-JS
+                  #{class_name}.#{k[2].value} =
+                    #{replace(v)};
+                JS
+              when :class
+                body << generate_class(part)
+              when :module
+                body << generate_module(part)
               end
             end
 
             if last_module
-              body                                        <<
-                "#{last_module}.#{class_name} = "         <<
-                "#{class_name};"
+              body.block <<-JS
+                #{last_module}.#{class_name} = #{class_name};
+              JS
             end
 
           end
@@ -89,29 +97,30 @@ module Liquidscript
           module_name = code[1].value
 
           in_module(module_name) do |last_module|
-            body << "#{module_name} = {};"
+            body << "#{module_name} ||= {};"
 
             code[2].each do |part|
-              k = part[0]
-              v = part[1]
+              k, v = part
               case k
               when :identifier
-                body                                      <<
-                  "#{module_name}.#{k.value} = "          <<
-                  replace(v) << ";"
+                body.block <<-JS
+                  #{module_name}.#{k.value} = #{replace(v)};
+                JS
               when :dstring
-                body                                      <<
-                  "#{module_name}[#{k.value}] = "         <<
-                  replace(v)  << ";"
+                body.block <<-JS
+                  #{module_name}[#{k.value}] = #{replace(v)};
+                JS
               when :class
                 body << generate_class(part)
+              when :module
+                body << generate_module(part)
               end
             end
 
             if last_module
-              body                                        <<
-                "#{last_module}.#{module_name} = "        <<
-                "#{module_name};"
+              body.block <<-JS
+                #{last_module}.#{module_name} = #{module_name};
+              JS
             end
           end
 

data/lib/liquidscript/scanner/lexer.rb

@@ -405,10 +405,11 @@ self.lexer_en_main = 5;
         line = proc do
           @line[:start] = @ts
           @line[:num] += 1
+          emit :newline
         end
 
         
-# line 412 "lib/liquidscript/scanner/lexer.rb"
+# line 413 "lib/liquidscript/scanner/lexer.rb"
 begin
 	    @p ||= 0
 	   @pe ||=  @data.length
@@ -418,9 +419,9 @@ begin
 	 @act = 0
 end
 
-# line 109 "lib/liquidscript/scanner/lexer.rl"
+# line 110 "lib/liquidscript/scanner/lexer.rl"
         
-# line 424 "lib/liquidscript/scanner/lexer.rb"
+# line 425 "lib/liquidscript/scanner/lexer.rb"
 begin
 	_klen, _trans, _keys, _acts, _nacts = nil
 	_goto_level = 0
@@ -450,7 +451,7 @@ begin
 		begin
  @ts =     @p
 		end
-# line 454 "lib/liquidscript/scanner/lexer.rb"
+# line 455 "lib/liquidscript/scanner/lexer.rb"
 		end # from state action switch
 	end
 	if _trigger_goto
@@ -746,7 +747,7 @@ when 37 then
  error             end
 end 
 			end
-# line 750 "lib/liquidscript/scanner/lexer.rb"
+# line 751 "lib/liquidscript/scanner/lexer.rb"
 			end # action switch
 		end
 	end
@@ -766,7 +767,7 @@ when 0 then
 # line 1 "NONE"
 		begin
  @ts = nil;		end
-# line 770 "lib/liquidscript/scanner/lexer.rb"
+# line 771 "lib/liquidscript/scanner/lexer.rb"
 		end # to state action switch
 	end
 	if _trigger_goto
@@ -793,7 +794,7 @@ end
 	end
 	end
 
-# line 110 "lib/liquidscript/scanner/lexer.rl"
+# line 111 "lib/liquidscript/scanner/lexer.rl"
 
         clean!
 

data/lib/liquidscript/scanner/lexer.rl

@@ -103,6 +103,7 @@ module Liquidscript
         line = proc do
           @line[:start] = @ts
           @line[:num] += 1
+          emit :newline
         end
 
         %% write init;

data/lib/liquidscript/scanner/token.rb

@@ -31,6 +31,10 @@ module Liquidscript
         @type == type
       end
 
+      def empty?
+        false
+      end
+
     end
 
   end

data/lib/liquidscript/template.rb

@@ -1,3 +1,5 @@
+require 'liquidscript/icr/sexp'
+
 module Liquidscript
   class Template
 
@@ -7,8 +9,10 @@ module Liquidscript
 
     def render
       @_render ||= begin
+        p Scanner.new(@data).each
         compiler = Compiler::ICR.new(Scanner.new(@data))
         compiler.compile
+        puts ICR::Sexp.new(compiler.top).output
         Generator::Javascript.new(compiler.top).generate
       end
     end

data/lib/liquidscript/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: liquidscript
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.2.0
 platform: ruby
 authors:
 - Jeremy Rodi