liquidscript 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ee4e04ff0fb7e70cc829b24f939b5dc3818876de
-  data.tar.gz: df98980cc63c5f2913684363eb897972d53dc59a
+  metadata.gz: 32708208fcf1f212c031c3d7e843219653887748
+  data.tar.gz: 8bf0b59774f62cdcaf18fc130cbbc8723311627e
 SHA512:
-  metadata.gz: e9a16921b5902920a3f5bab535fb597f7076d9d441daf504ae19c5536fa76d4aaa866876440711abccf355f3225df1e2a5e80ad7fe787f04cdf94032e4196ec2
-  data.tar.gz: 1eae537900f300cdeb2a58db4a9aa6dc000dc75d1d555a78e0f8c69f5a5291954df851f1b5c623199fb135677735539a12aef07d1073f0c10fa3d138169f7b63
+  metadata.gz: 48960e3bcdea3d27a3c4bf0b5e3e182b4e2f4d0731c4cffeba7eba89a1e8cd3202663d4a45b49f825edd467db704080f38e0e544b062f03c1b816f0cbad863c8
+  data.tar.gz: 9c60166e3f63e8b96f3d7c055b86e037b17d955b7182da3be656f10d8be5405df98c83b0f83af10c7cf49e74710cd34d54b9718a5b6f1e21c9905e4df52fea3a

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

@@ -19,7 +19,7 @@ module Liquidscript
           out = expect :number,     :identifier,
                        :istring,    :lparen,
                        :sstring,    :operator,
-                       :keyword,    :unop,
+                       :keyword,
                        :regex,
                        :newline,
                        :istring_begin,
@@ -28,6 +28,9 @@ module Liquidscript
                        :lbrace   => :object,
                        :lbrack   => :array,
                        :arrow    => :function,
+                       [
+                        :preunop, :unop
+                       ]         => :unop,
                        [
                         :heredoc_ref, :iheredoc_ref
                        ]         => :href,
@@ -56,7 +59,7 @@ module Liquidscript
         end
 
         def compile_unop
-          code :unop, shift(:unop), compile_vexpression
+          code :unop, shift(:unop, :preunop), compile_vexpression
         end
 
         # Handles an assignment of the form `identifier = expression`,

data/lib/liquidscript/scanner/liquidscript.rb

@@ -23,9 +23,12 @@ module Liquidscript
           }x
 
           set :unops, %w(
-            !
             ++
             --
+          )
+
+          set :preunops, %w(
+            !
             ~
             new
             return
@@ -74,7 +77,7 @@ module Liquidscript
           on(:number)     { |m| emit :number,  m    }
           on(:string)     { |m| emit :sstring, m    }
           on(:keywords)   { |m| emit :keyword, m    }
-          on(:actions)    { |m| emit :action, m     }
+          on(:actions)    { |m| emit :action,  m    }
           on("->")        {     emit :arrow         }
           on("=")         {     emit :equal         }
           on("{")         {     emit :lbrace        }
@@ -102,9 +105,11 @@ module Liquidscript
             emit :regex, [m, b]
           }
           on("///" => :block_regex)
-          on(:binops)     { |m| emit :binop,   m    }
-          on(:unops)      { |m| emit :unop,    m    }
-          on(:identifier) { |m| emit :identifier, m.gsub(/\-[a-z]/) { |m| m[1].upcase } }
+          on(:binops)     { |m| emit :binop,    m   }
+          on(:preunops)   { |m| emit :preunop,  m   }
+          on(:unops)      { |m| emit :unop,     m   }
+
+          on(:identifier) { |m| emit :identifier, m.gsub(/\-[a-z]/) { |p| p[1].upcase } }
 
           on(%r{#! ([A-Za-z]+) ?(.*?)\n}) do |_, c, a|
             metadata[:directives] ||= []

data/lib/liquidscript/version.rb

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

data/spec/fixtures/example.generate.yml

@@ -0,0 +1,40 @@
+data: |
+  class Greeter {
+    initialize: (name)-> {
+        this.name = name
+    }
+
+    greet: -> {
+        console.log("Hello #{this.name}!")
+    }
+
+    this.meet: (first, second)-> {
+        new Greeter(first).greet()
+        new Greeter(second).greet()
+    }
+  }
+
+  Greeter.meet("Alice", "Bob")
+
+compiled: |
+  var Greeter;
+  Greeter = Greeter || function Greeter() {
+    if(this.initialize) {
+      this.initialize.apply(this, arguments);
+    }
+  }
+
+  Greeter.prototype.initialize = function(name) {
+    this.name = name;
+  };
+
+  Greeter.prototype.greet = function() {
+    console.log("Hello " + (this.name) + "!");
+  };
+
+  Greeter.meet = function(first, second) {
+    new Greeter(first).greet();
+    new Greeter(second).greet();
+  };;
+
+  Greeter.meet("Alice", "Bob");

data/spec/liquidscript/scanner/lexer_spec.rb

@@ -45,10 +45,10 @@ describe Liquidscript::Scanner::Liquidscript, :lexer_helper do
 
     it "scans keywords" do
       scan("return test = new foo").should eq [
-        [:unop, "return"],
+        [:preunop, "return"],
         [:identifier, "test"],
         [:equal, nil],
-        [:unop, "new"],
+        [:preunop, "new"],
         [:identifier, "foo"]
       ]
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: liquidscript
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Jeremy Rodi
@@ -160,6 +160,7 @@ files:
 - spec/fixtures/class.generate.yml
 - spec/fixtures/combination.generate.yml
 - spec/fixtures/complex.generate.yml
+- spec/fixtures/example.generate.yml
 - spec/fixtures/expression.generate.yml
 - spec/fixtures/function.generate.yml
 - spec/fixtures/get.generate.yml
@@ -219,6 +220,7 @@ test_files:
 - spec/fixtures/class.generate.yml
 - spec/fixtures/combination.generate.yml
 - spec/fixtures/complex.generate.yml
+- spec/fixtures/example.generate.yml
 - spec/fixtures/expression.generate.yml
 - spec/fixtures/function.generate.yml
 - spec/fixtures/get.generate.yml