nasl 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: f7f194e85bfffd0d60eeba8e2e0c9731fefb8efd
-  data.tar.gz: d1ae8dbd9a8f4cfa6bdea898acb19c6e07715e28
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    ZWMwMTc1ZTg3N2ZmZDJjYzBkN2U3NDljZWM0MGMxNDUxNzc4ZmI2Yg==
+  data.tar.gz: !binary |-
+    MGZmMWYyMmVkOTA3ZjhlZTUwNGY4YWI3OGJmYzA0YzlmNThlMjg0NQ==
 SHA512:
-  metadata.gz: 127f28c3d561498967aedd5de3ae092eec8327b1781a8a7321934fb40c617f2aab5940b6ff1f6bdfeb90b1122f1489f2b83a42273a4a8dcbdeb54ddddb28aeba
-  data.tar.gz: 25f4fc9e456ad37df32f2fe6999ec3fa62089511d2d71a6703772ef454da6bbde0ba80b140051dc007a0b792693d4d358d21e13c585e6bd7f85215425236a29c
+  metadata.gz: !binary |-
+    Nzc0ZjcyMTk5ZjZkNzgxZmYxMTVhNzRmNjE0ZDJhOWNlNTEwMTllMzk1NjYz
+    ODBhNTc1NjIxYzhkNmJjZTVmMDJkMGMzMDg5YzViYzBiMjZkZTA1ZmFjM2Q1
+    ZjRhMDFkZDg0ZDFkY2MwYTYwOGM3YWU3MzFiZjMxMmU1NWVhMWM=
+  data.tar.gz: !binary |-
+    MWRhZDY3MjQ4NDg5ZjQ5ZTExOTk3MjIyODJlN2IzNGZhNTliOTAwODA1ZmM4
+    MWM5OWRkNzdmNzgyZDM3Y2JkOTMyNGY0ZTI1YzdlMWUxMTgzMWZmNjAxNzJj
+    NWE2ZDNjZDQzMTI0MWE4M2M5ODY1YzQ2MDhhOTM3M2MyYzIwZjQ=

data/Rakefile

@@ -59,7 +59,7 @@ task :tag_and_bag do
 end
 
 task :release => [:tag_and_bag, :build] do
- 	system "gem push #{Nasl::APP_NAME}-#{Nasl::VERSION}.gem"
+ 	system "gem push nasl-#{Nasl::VERSION}.gem"
 end
 
 task :default => :compile

data/lib/nasl/grammar.racc

@@ -221,9 +221,9 @@ rule
              ;
 
   foreach    : FOREACH ident LPAREN expr RPAREN statement
-             { n(:Foreach, val[1], val[3], val[5]) }
+             { n(:Foreach, val[0], val[1], val[3], val[5]) }
              | FOREACH LPAREN ident IN expr RPAREN statement
-             { n(:Foreach, val[2], val[4], val[6]) }
+             { n(:Foreach, val[0], val[2], val[4], val[6]) }
              ;
 
   if         : IF LPAREN expr RPAREN statement
@@ -382,10 +382,14 @@ rule
              { n(:KeyValuePair, *val) }
              | int COLON expr
              { n(:KeyValuePair, *val) }
+             | ident COLON expr
+             { n(:KeyValuePair, *val) }
              | string COLON ref
              { n(:KeyValuePair, *val) }
              | int COLON ref
              { n(:KeyValuePair, *val) }
+             | ident COLON ref
+             { n(:KeyValuePair, *val) }
              ;
 
   kv_pairs   : kv_pair COMMA kv_pairs

data/lib/nasl/parser/array.rb

@@ -38,6 +38,8 @@ module Nasl
       @keys = Hash[@pairs.map do |p|
         if p.key.is_a? String
           k = p.key.text
+        elsif p.key.is_a? Identifier
+          k = p.key.name
         else
           k = p.key.value
         end

data/lib/nasl/parser/foreach.rb

@@ -33,9 +33,9 @@ module Nasl
     def initialize(tree, *tokens)
       super
 
-      @iter = @tokens[0]
-      @expr = @tokens[1]
-      @body = @tokens[2]
+      @iter = @tokens[1]
+      @expr = @tokens[2]
+      @body = @tokens[3]
 
       @children << :iter
       @children << :expr

data/lib/nasl/version.rb

@@ -25,5 +25,5 @@
 ################################################################################
 
 module Nasl
-  VERSION = '0.2.0'
+  VERSION = '0.3.0'
 end

data/test/unit/parser/test_array.rb

@@ -171,4 +171,8 @@ class TestArray < Test::Unit::TestCase
   def test_empty_array_with_comma
     fail_parse(%q|return {,};|)
   end
+
+  def test_array_with_unquoted_key
+    parse(%q|return {a:@foo, b:"hello", c:3};|)
+  end
 end

data/test/unit/parser/test_foreach.rb

@@ -40,4 +40,13 @@ class TestForeach < Test::Unit::TestCase
       '<tree><foreach><identifier name="foo"/><lvalue><identifier name="bar"/></lvalue><empty/></foreach></tree>'
     )
   end
+
+  # Check that the 'foreach' itself is in the tokens list
+  def test_foreach_in_tokens
+    tree = parse(%q|foreach foo (bar);|)
+    assert_equal(
+      tree.all(:Foreach).first.tokens.first.to_s,
+      "foreach"
+    )
+  end
 end

data/test/unit/parser/test_if.rb

@@ -82,4 +82,13 @@ class TestIf < Test::Unit::TestCase
       '<tree><if><integer value="1"/><if><integer value="1"/><call><lvalue><identifier name="foo"/></lvalue></call></if><call><identifier name="bar"/></call></if></tree>'
     )
   end
+
+  # Check that the 'if' itself is in the tokens list
+  def test_if_in_tokens
+    tree = parse(%q|if (foo) {};|)
+    assert_equal(
+      tree.all(:If).first.tokens.first.to_s,
+      "if"
+    )
+  end
 end

data/test/unit/parser/test_while.rb

@@ -0,0 +1,38 @@
+################################################################################
+# Copyright (c) 2011-2014, Tenable Network Security
+# 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 TestWhile < Test::Unit::TestCase
+  include Nasl::Test
+
+  # Check that the 'while' itself is in the tokens list
+  def test_while_in_tokens
+    tree = parse(%q|while (foo) {}|)
+    assert_equal(
+      tree.all(:While).first.tokens.first.to_s,
+      "while"
+    )
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nasl
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Mak Kolybabi
@@ -10,62 +10,62 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-28 00:00:00.000000000 Z
+date: 2015-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: racc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.4'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.1'
 - !ruby/object:Gem::Dependency
   name: builder
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.1'
 - !ruby/object:Gem::Dependency
   name: rainbow
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.0'
 description: A language parser for the Nessus Attack Scripting Language. Supporting
@@ -79,8 +79,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".travis.yml"
+- .gitignore
+- .travis.yml
 - Gemfile
 - Gemfile.ci
 - README.md
@@ -162,6 +162,7 @@ files:
 - test/unit/parser/test_repetition.rb
 - test/unit/parser/test_return.rb
 - test/unit/parser/test_string.rb
+- test/unit/parser/test_while.rb
 - test/unit/parser/test_whitespace.rb
 - test/unit/test_context.rb
 - test/unit/tokenizer/test_comment.rb
@@ -179,17 +180,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: nasl
-rubygems_version: 2.2.0
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: A language parser for the Nessus Attack Scripting Language.
@@ -216,6 +217,7 @@ test_files:
 - test/unit/parser/test_repetition.rb
 - test/unit/parser/test_return.rb
 - test/unit/parser/test_string.rb
+- test/unit/parser/test_while.rb
 - test/unit/parser/test_whitespace.rb
 - test/unit/test_context.rb
 - test/unit/tokenizer/test_comment.rb