delorean_lang 0.2.4 → 0.3.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MThkOGViN2U0NDc5MjEyMmVhM2Y0NGIyN2QwNTRhZjFhY2M1NTMyMA==
+    NTA5ZTg4OTNlZWQ4NWZmYTRjZWI0M2ZkYjRkZGQ4ZjM2ZmZhOWU2Yg==
   data.tar.gz: !binary |-
-    ODhlNDc3ODRkZGI4OWMwNzRiNzM1ODA4ZWI3MzY2OWYzNTdhZGRiOA==
+    NDg5MDRmMTQ0NjNiN2Q0ZGVjZmIyMjM5OTkxN2QwZjliMmI4NTQwMQ==
 SHA512:
   metadata.gz: !binary |-
-    NjY0MzZiZTZmNDUzMmM2YmYyYjAxZjNiY2QxODY1OTQzNmZiNjJkOWM3NTMz
-    ZDhjYTFjZWRjYzE4ZmFmYWYyMmQ5NzY3OTFiODg5MDdlZGM5YWMwZjRiZWFh
-    MGNkYTczZGJmOTY1Zjg2MTM0ZjlhNDcyZTQzNjUzYzdmMDBiODM=
+    ZmFjNGMwZDAxZjNhZTQ0ZTdkOWNmOTRmYTY2ZDZlY2Q0NGY3MDVlZDc2Yjlk
+    ZWExNWNlODIyZjJmZWFkMDRiMGMwMzU5NDBlM2UwZjYwYTMwMTgzZjFjNTk5
+    NmU0NzgwYTg4ODUzYWJjYWQxMTlmYTgwZTZkNGM2NzZmNmQzNTQ=
   data.tar.gz: !binary |-
-    YjFiN2E5YjdiYmE1NjA3OTY5OTYyZDE5N2MzZGUyMjk1YjdmMTYzNmExNjRm
-    ZDhmMWE2OTFlMGYyZGRmNzMxZTIwMTliNjAyNDljNWRiN2MxYTdkMjg0OTcz
-    NGUwYjhmYTIzNDE3MDgzODE0YTdhMGNmNzM3NWEzN2VhYmRiNzk=
+    ZDhlNzQ3MDA1NzFlYTEwMzRmZWUwNTc3MWRjY2NkYzY0MTJhOWY4MjFkMTNm
+    ZWUzYTQ5NTAyMWYwNDgwMTAxOTkyODg0NGFhY2Q0NWE0OGUyMTJmODYxMDk5
+    YzA2ZWEyMGZkYzJlY2FjOTNjNmQ1YjQyYmRjNTMwOGU2MmQ3ODM=

data/lib/delorean/engine.rb

@@ -255,34 +255,37 @@ module Delorean
         next if line.length == 0
 
         if multi_line
-          # Inside a multiline and next line doesn't look like a
-          # continuation => syntax error.
-          err(ParseError, "syntax error") unless line =~ /^\s+/
-
-          multi_line += line
-          t = parser.parse(multi_line)
+          # if line starts with >4 spaces, assume it's a multline
+          # continuation.
+          if line =~ /\A {5}/
+            multi_line += line
+            next
+          else
+            t = parser.parse(multi_line)
+            err(ParseError, "syntax error") unless t
 
-          if t
             multi_line, @multi_no = nil, nil
             generate(t)
           end
+        end
 
-        else
-          t = parser.parse(line)
+        t = parser.parse(line)
 
-          if !t
-            err(ParseError, "syntax error") unless line =~ /^\s+/
+        if !t
+          err(ParseError, "syntax error") unless line =~ /^\s+/
 
-            multi_line = line
-            @multi_no = @line_no
-          else
-            generate(t)
-          end
+          multi_line = line
+          @multi_no = @line_no
+        else
+          generate(t)
         end
       end
 
-      # left over multi_line
-      err(ParseError, "syntax error") if multi_line
+      if multi_line
+        t = parser.parse(multi_line)
+        err(ParseError, "syntax error") unless t
+        generate(t)
+      end
     end
 
     ######################################################################

data/lib/delorean/version.rb

@@ -1,3 +1,3 @@
 module Delorean
-  VERSION = "0.2.4"
+  VERSION = "0.3.0"
 end

data/spec/eval_spec.rb

@@ -672,13 +672,13 @@ eof
     engine.parse defn("A:",
                       "    a = 1",
                       "    b = [a+1",
-                      "         for a in [1,2,3]",
-                      "    ]",
+                      "        for a in [1,2,3]",
+                      "        ]",
                       )
     engine.evaluate("A", "b").should == [2, 3, 4]
   end
 
-  it "should eval multiline expressions" do
+  it "should eval multiline expressions (2)" do
     engine.parse defn("A:",
                       "    a = 123",
                       "    b = 456 + ",

data/spec/parse_spec.rb

@@ -701,6 +701,33 @@ describe "Delorean" do
     end
   end
 
+  it "should give proper errors when multiline doesn't end properly" do
+    begin
+      engine.parse defn("A:",
+                        "    a = 1",
+                        "    b = [a+1",
+                        "        for a in [1,2,3]",
+                        "B:",
+                        )
+      raise "fail"
+    rescue Delorean::ParseError => exc
+      exc.line.should == 3
+    end
+  end
+
+  it "should error on multiline not properly spaced" do
+    begin
+      engine.parse defn("A:",
+                        "    a = [1,",
+                        "    2]",
+                        "    b = 456",
+                        )
+      raise "fail"
+    rescue Delorean::ParseError => exc
+      exc.line.should == 2
+    end
+  end
+
   it "should parse imports" do
     engine.parse defn("import AAA",
                       "A:",

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: delorean_lang
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.3.0
 platform: ruby
 authors:
 - Arman Bostani
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-14 00:00:00.000000000 Z
+date: 2014-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: treetop