nasl 0.0.1 → 0.0.2

data/lib/nasl/parser/call.rb

@@ -34,7 +34,7 @@ module Nasl
       super
 
       @name = @tokens[0]
-      @args = if @tokens[2].is_a? Argument then @tokens[2] else [] end
+      @args = if @tokens[2].is_a? Array then @tokens[2] else [] end
 
       @arg = {}
       @args.select { |a| a.type == :named }.each do |a|

data/lib/nasl/test.rb

@@ -44,15 +44,7 @@ module Nasl
     end
 
     def parse(code)
-      begin
-        tree = Nasl::Parser.new.parse(code)
-        msg = ''
-      rescue Racc::ParseError => e
-        tree = nil
-        msg = e
-      end
-
-      return tree, msg
+      Nasl::Parser.new.parse(code, "(test)")
     end
 
     def tokenize(code)
@@ -64,9 +56,9 @@ module Nasl
     end
 
     def fail(code)
-      tree, msg = parse(code)
+      tree = parse(code)
 
-      assert_nil(tree, msg)
+      assert_nil(tree)
     end
 
     def fail_parse(code)
@@ -78,20 +70,20 @@ module Nasl
     end
 
     def pass(code)
-      tree, msg = parse(code)
+      tree = parse(code)
 
-      assert_not_nil(tree, msg)
+      assert_not_nil(tree)
     end
 
     def diff(code, kg_tree)
-      tree, msg = parse(code)
-      assert_not_nil(tree, msg)
+      tree = parse(code)
+      assert_not_nil(tree)
       assert_not_equal(flatten(kg_tree), flatten(tree.to_s)) if !tree.nil?
     end
 
     def same(code, kg_tree)
-      tree, msg = parse(code)
-      assert_not_nil(tree, msg)
+      tree = parse(code)
+      assert_not_nil(tree)
       assert_equal(flatten(kg_tree), flatten(tree.to_s)) if !tree.nil?
     end
   end

data/lib/nasl/version.rb

@@ -1,3 +1,3 @@
 module Nasl
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
 end

data/nasl.gemspec

@@ -13,7 +13,6 @@ Gem::Specification.new do |s|
   s.rubyforge_project = 'nasl'
 
   s.files         = `git ls-files`.split("\n") + ['lib/nasl/grammar.tab.rb']
-
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ['lib']

data/test/unit/parser/test_call.rb

@@ -0,0 +1,131 @@
+################################################################################
+# Copyright (c) 2011, Mak Kolybabi
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# 1. Redistributions of source code must retain the above copyright notice, this
+#    list of conditions and the following disclaimer.
+#
+# 2. Redistributions in binary form must reproduce the above copyright notice,
+#    this list of conditions and the following disclaimer in the documentation
+#    and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+################################################################################
+
+class TestCall < Test::Unit::TestCase
+  include Nasl::Test
+
+  def test_no_args
+    tree = parse("foo();")
+    assert_not_nil(tree)
+
+    calls = tree.all(:Call)
+    assert_not_nil(calls)
+    assert_equal(1, calls.length)
+
+    call = calls.first
+    assert_not_nil(call)
+    assert_equal(0, call.args.length)
+  end
+
+  def test_anonymous_args
+    tree = parse("foo(1, '2', three);")
+    assert_not_nil(tree)
+
+    calls = tree.all(:Call)
+    assert_not_nil(calls)
+    assert_equal(1, calls.length)
+
+    call = calls.first
+    assert_not_nil(call)
+    assert_equal(3, call.args.length)
+
+    arg = call.args[0]
+    assert_equal(:anonymous, arg.type)
+    assert(arg.expr.is_a? Nasl::Integer)
+
+    arg = call.args[1]
+    assert_equal(:anonymous, arg.type)
+    assert(arg.expr.is_a? Nasl::String)
+
+    arg = call.args[2]
+    assert_equal(:anonymous, arg.type)
+    assert(arg.expr.is_a? Nasl::Lvalue)
+  end
+
+  def test_named_args
+    tree = parse("foo(a:1, b:'2', c:three);")
+    assert_not_nil(tree)
+
+    calls = tree.all(:Call)
+    assert_not_nil(calls)
+    assert_equal(1, calls.length)
+
+    call = calls.first
+    assert_not_nil(call)
+    assert_equal(3, call.args.length)
+
+    arg = call.args[0]
+    assert_equal(:named, arg.type)
+    assert(arg.name.is_a? Nasl::Identifier)
+    assert(arg.expr.is_a? Nasl::Integer)
+    assert_equal(arg.expr, call.arg['a'])
+
+    arg = call.args[1]
+    assert_equal(:named, arg.type)
+    assert(arg.name.is_a? Nasl::Identifier)
+    assert(arg.expr.is_a? Nasl::String)
+    assert_equal(arg.expr, call.arg['b'])
+
+    arg = call.args[2]
+    assert_equal(:named, arg.type)
+    assert(arg.name.is_a? Nasl::Identifier)
+    assert(arg.expr.is_a? Nasl::Lvalue)
+    assert_equal(arg.expr, call.arg['c'])
+  end
+
+  def test_mixed_args
+    tree = parse("foo(a:1, '2', c:three, bar());")
+    assert_not_nil(tree)
+
+    calls = tree.all(:Call)
+    assert_not_nil(calls)
+    assert_equal(2, calls.length)
+
+    call = calls[1]
+    assert_not_nil(call)
+    assert_equal(4, call.args.length)
+
+    arg = call.args[0]
+    assert_equal(:named, arg.type)
+    assert(arg.name.is_a? Nasl::Identifier)
+    assert(arg.expr.is_a? Nasl::Integer)
+    assert_equal(arg.expr, call.arg['a'])
+
+    arg = call.args[1]
+    assert_equal(:anonymous, arg.type)
+    assert(arg.expr.is_a? Nasl::String)
+
+    arg = call.args[2]
+    assert_equal(:named, arg.type)
+    assert(arg.name.is_a? Nasl::Identifier)
+    assert(arg.expr.is_a? Nasl::Lvalue)
+    assert_equal(arg.expr, call.arg['c'])
+
+    arg = call.args[3]
+    assert_equal(:anonymous, arg.type)
+    assert(arg.expr.is_a? Nasl::Call)
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nasl
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-12-25 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &17200984620 !ruby/object:Gem::Requirement
+  requirement: &17198404300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *17200984620
+  version_requirements: *17198404300
 - !ruby/object:Gem::Dependency
   name: builder
-  requirement: &17200984200 !ruby/object:Gem::Requirement
+  requirement: &17198403880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *17200984200
+  version_requirements: *17198403880
 - !ruby/object:Gem::Dependency
   name: racc
-  requirement: &17200983780 !ruby/object:Gem::Requirement
+  requirement: &17198403460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *17200983780
+  version_requirements: *17198403460
 - !ruby/object:Gem::Dependency
   name: rainbow
-  requirement: &17200983360 !ruby/object:Gem::Requirement
+  requirement: &17198403040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *17200983360
+  version_requirements: *17198403040
 description: 
 email:
 - mak@kolybabi.com
@@ -118,6 +118,7 @@ files:
 - test/unit/parser/test_assignment.rb
 - test/unit/parser/test_blank.rb
 - test/unit/parser/test_block.rb
+- test/unit/parser/test_call.rb
 - test/unit/parser/test_constant.rb
 - test/unit/parser/test_empty.rb
 - test/unit/parser/test_expressions.rb