shuwar 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5ddc147f458aa5dc51b986b2d02eaf293732a792
-  data.tar.gz: 934e9a7034d0582289f25c51b9206e2adfdc99d5
+  metadata.gz: 1909c5f5e8fd8443e2fd2920354cafcc5f1cdcd0
+  data.tar.gz: d494975a0d8cc4e33caeef0308a69cbe1c774018
 SHA512:
-  metadata.gz: 70d051e0a81a39f10b044c5f413003f3d2e7b4141eea150b5abe76432cb6e9d4eb3385e3e8d1a9a4d4b56ece97f3955c72c6583f214efd67fcc801b6806fc778
-  data.tar.gz: 1662c7ffb5ce1679a12625a79cde9b19f1fb1f318d6c98d2bcefb82076d467754ceabe3460d6652073b968d5fd1494d5bc30f53c48dcfad718777057c0a8ede6
+  metadata.gz: 669013248c1c819f895379b02f0b511b841ed79db560ee5bb0d394d16b20fbfdd6c2d7037aca5e52327aac3e01e219f3bb0c3e1aaaa537ad376167d69a1d5ef3
+  data.tar.gz: 5a7dc85c47835aee4b3378e0833fc763f44d49f5d56d2fd1058412dd8bc75aca9d038c16973435038598b8f8cd0323582df7a6a4b28ced1e2e81a6f006010266

data/lib/shuwar/stdlib/base.rb

@@ -1,4 +1,4 @@
-require "shuwar/stdlib"
+require "shuwar"
 
 module Shuwar::Stdlib
   module Base
@@ -17,6 +17,29 @@ module Shuwar::Stdlib
 
         puts: lambda do |*vals|
           puts *vals
+        end,
+
+        load_file: lambda do |name|
+          File.open name do |f|
+            tk = Shuwar::Tokenizer.new f
+            parser = Shuwar::Parser.new tk
+            runtime = Shuwar::Runtime.new
+
+            parser.each_object do |x|
+              runtime.evaluate x
+            end
+
+            runtime
+          end
+        end,
+
+        fetch: lambda do |env, key|
+          env.get_value key
+        end,
+
+        from_file: lambda do |name, key|
+          env = evaluate [:load_file, name]
+          env.get_value key
         end
     }
 

data/lib/shuwar/stdlib/nokogiri.rb

@@ -14,7 +14,12 @@ module Shuwar::Stdlib
       def initialize(name, attrs, *children)
         @name = name.to_s
         @attrs = attrs.to_h
-        @children = children
+        if children.all? {|a| a.is_a? String}
+          # Multi strings should get a space between them
+          @children = [children.join(" ")]
+        else
+          @children = children
+        end
       end
 
       def add_to(a)

data/lib/shuwar/tokenizer.rb

@@ -56,10 +56,8 @@ module Shuwar
               block.call t.to_i
             when t.chars.all? {|c| ('1'..'9') === c or c == '.' }
               block.call t.to_f
-            when /\A[a-zA-Z]\z/ =~ t[0] && t.chars.all? {|c| /\A[a-zA-Z0-9_]+\z/ =~ c }
-              block.call t.to_sym
             else
-              raise "#{t}? What was that?"
+              block.call t.to_sym
           end
         end
       else

data/lib/shuwar/version.rb

@@ -1,3 +1,3 @@
 module Shuwar
-  VERSION = "1.2.0"
+  VERSION = "1.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shuwar
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - dramforever
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-12 00:00:00.000000000 Z
+date: 2014-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler