xash 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2ea6ec31fe55c1fad359d00416d8fa91a19067ee
-  data.tar.gz: b59f781bf66869db18f9920312793a7710c04381
+  metadata.gz: ef39f5bc4d2c7429a9ba6ec3d46c7d2f418df55d
+  data.tar.gz: d18458646ddda4f2fd67b52524a4676866e5f7c5
 SHA512:
-  metadata.gz: b0c76d221977d272ccddc6243d2002a83b4d964c094dfc8395b747e8adcc6804d70c2cb9cc42058f1ed050af9a8772d4a36b68d46bbc00b39c0af41df6354944
-  data.tar.gz: a71041ae1493cc35a094d93582ab744d1299b90b07bdfc634e314834be6abbd1f5af961e4e3edf17966efd60986201cee47af03ffff69ee5c0e2f9188112edd6
+  metadata.gz: 47eec271a3c622e599a222de098c9bc5c45a06d0659468b66bdded3d284598b18a47eb913d553d9417c6e23d7ce4ad625782ea7077a144ab399f040130b55d4c
+  data.tar.gz: 139bd4dd4930b70271e64975b16099adbe13b1db22b3920bfcef0decbecfcd75315db926480a299a71025a8ce27c2cc37f711569741b2f74d1f0a00d572b7cea

data/lib/xash/evaluator.rb

@@ -18,7 +18,7 @@ module XASH
                     if @pseudo_functions.has_key? name
                         variables[name] = '<internal>'
                     end
-                end         
+                end
             end
             raise klass, {
                 current_name: cc.name || 'nil',
@@ -63,7 +63,7 @@ module XASH
                 'alias' => wrap_pseudo_function(['old', 'new'], '__alias'),
 
                 'import_yaml' => wrap_pseudo_function([], '__import_yaml'),
-                
+
                 'boot' => wrap_pseudo_function(['lambda'], '__boot'),
                 'method' => wrap_pseudo_function([], '__method'),
                 'get' => wrap_pseudo_function(['obj', 'name'], '__get'),
@@ -72,7 +72,10 @@ module XASH
 
                 #for arrays
                 'index' => wrap_pseudo_function(['ary', 'i'], '__index'),
+                'head' => wrap_pseudo_function(['ary'], '__head'),
                 'tail' => wrap_pseudo_function(['ary'], '__tail'),
+                'cons' => wrap_pseudo_function(['val', 'ary'], '__cons'),
+                'join' => wrap_pseudo_function(['ary', 'sep'], '__join'),
 
                 'meta_context' => wrap_pseudo_function(%w(lambda_args lambda), '__meta_context'),
                 'expr' => wrap_pseudo_function([], '__expr')
@@ -132,7 +135,7 @@ module XASH
                     to_rpn(tokens[0...idx], rpn)
                     to_rpn(tokens[(idx + 1)...tokens.size], rpn)
                     rpn << ope
-                    return 
+                    return
                 end
             end
             rpn << tokens[0]
@@ -304,11 +307,25 @@ module XASH
 
                     ary[i]
 
+                when '__head'
+                    check_args(v, :array)
+                    v[0][0]
+
                 when '__tail'
                     check_args(v, :array)
                     ary = v[0]
                     ary[1...ary.size]
 
+                when '__cons'
+                    check_args(v, nil, :array)
+                    val, ary = v
+                    ary.dup.unshift(val)
+
+                when '__join'
+                    check_args(v, :array, :string)
+                    ary, sep = v
+                    ary.join(sep)
+
                 when '__meta_context'
                     check_args(v, :array, :executable)
 
@@ -333,7 +350,7 @@ module XASH
                     end
 
                 when '__expr'
-                    
+
                     tokens = @context_stack.variable('args')
 
                     rpn = []
@@ -367,12 +384,12 @@ module XASH
                 #function call
                 else #others
                     exec(@context_stack.variable(k), v, k)
-                end 
-            when /\$(\w+)/ #local variables
+                end
+            when /\A\$(\w+)/ #local variables
                 var_name = $1
                 @context_stack.variable(var_name)
-            when /(\d+)(\.\.\.|\.\.)(\d+)/ #range expr
-                { 'range' => [$1, $2, $3] }
+            when /([\w\$]+)(\.\.\.|\.\.)([\w\$]+)/ #range expr
+                { 'range' => [$1, $2, $3].map{|e| eval_expr(e) } }
             else
                 #primitives
                 expr
@@ -383,4 +400,4 @@ module XASH
             exec({ 'do' => code }, [])
         end
     end
-end
+end

data/lib/xash/version.rb

@@ -1,3 +1,3 @@
 module XASH
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xash
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - long-long-float
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-09 00:00:00.000000000 Z
+date: 2016-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slop