nasl 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8dbfbd10777b11f9eb32bfa1852b114e4ba027b8
-  data.tar.gz: 3adae20946d690b72b6cce0378ec3bb36cf6ec90
+  metadata.gz: ba5d4713f9f37ff1cef35443d8e0a7befdf7a8ab
+  data.tar.gz: 90c08ad08a102e283f0313a422af423c043cc775
 SHA512:
-  metadata.gz: 3f58cb329f9293ef5e32f130864af3e48fd07d66555866c1ede44c719fcbc88d8c6e1781a9bcac5b261a2b26a320b5231c865697126d4853276c7bb7decf7225
-  data.tar.gz: 4fb81fb4ba0a4c54d2df014a423578bb53cb3eb6ba1acda35e24df4cb3440e40a7eee2070b07dc98790f98757ecc03079392cb1dfb13e2cf8fc4f5c3c1fed18a
+  metadata.gz: 9b18b5139c6eb7acc431cf003184f47d587fbc05908aa1f972f8908dd0da42c1e295827408042295e8ca654a60e6872b89d835d067b6098fb4b61aa824c54b8e
+  data.tar.gz: dbecc5c082b505176925ff1f9d0d8e7b8ac47b1ac9445eaf330dc120693b679853287b6ecae7fd55ce960cb97a9ae4f46270b65206abf3df3c2963431535104e

data/lib/nasl/grammar.racc

@@ -122,6 +122,10 @@ rule
                { n(:Function, val[0], 'obj', val[1], val[2], val[3], val[4], val[5], val[6]) }
                | obj_func_attr FUNCTION ident LPAREN RPAREN block
                { n(:Function, val[0], 'obj', val[1], val[2], val[3], val[4], val[5]) }
+               | FUNCTION ident LPAREN params RPAREN block
+               { n(:Function, val[0], 'obj', val[1], val[2], val[3], val[4], val[5]) }
+               | FUNCTION ident LPAREN RPAREN block
+               { n(:Function, val[0], 'obj', val[1], val[2], val[3], val[4]) }
                ;
 
   function   : FUNCTION ident LPAREN params RPAREN block
@@ -261,9 +265,7 @@ rule
              { n(:Return, *val) }
              ;
 
-  obj_func_attr : /* Empty */ 
-                { nil }
-                | PUBLIC 
+  obj_func_attr : PUBLIC 
                 { val[0] }
                 | PRIVATE
                 { val[0] }

data/lib/nasl/parser/function.rb

@@ -34,16 +34,27 @@ module Nasl
       super
 
       @body = @tokens.last
-
       @fn_type = @tokens[1]
 
       if @fn_type == "obj"
-        @name = @tokens[3]
-        @attribute = @tokens[0]
         if @tokens.length == 8 
+          @name = @tokens[3]
+          @attribute = @tokens[0]
           @params = @tokens[5]          
-        else
+        elsif @tokens.length == 7
+          if @tokens[0].is_a?(Token) && @tokens[0].type == :FUNCTION
+            @attribute = nil
+            @params = @tokens[4]
+            @name = @tokens[2]
+          else
+            @name = @tokens[3]
+            @attribute = @tokens[0]
+            @params = []
+          end
+	elsif @tokens.length == 6
+          @attribute = nil
           @params = []
+          @name = @tokens[2]
         end
       else
         @name = @tokens[2]

data/lib/nasl/version.rb

@@ -25,5 +25,5 @@
 ################################################################################
 
 module Nasl
-  VERSION = '0.5.0'
+  VERSION = '0.6.0'
 end

data/test/unit/parser/test_object.rb

@@ -37,11 +37,15 @@ namespace test {
       var a1,b1;
       # foo
       public function bar_pub() {}
+      public function bar_pub1(foo) {}
+
       # foo
       function bar_priv_default() { a = 1; return a; }
       private function bar_priv() {}
+      function test_bar1(foo) {}
+
       # foo
-      function test_var()
+      function test_bar()
       {
         var test = 'a';
         var x,y,z,t;
@@ -52,7 +56,7 @@ namespace test {
   function foo(){}
 }
 # foo!
-function foo(){}
+function foo1(){}
       EOF
     )
     assert_not_nil(tree)
@@ -62,11 +66,25 @@ function foo(){}
     assert_equal(objects[0].name.name, "foo")
 
     functions = tree.all(:Function)
-    assert_equal(6, functions.length)
+    assert_equal(8, functions.length)
 
     assert_equal(functions[0].tokens[0].type.to_s, "PUBLIC")
-    assert_equal(functions[1].tokens[0], nil)
-    assert_equal(functions[2].tokens[0].type.to_s, "PRIVATE")
+    assert_equal(functions[3].tokens[0].type.to_s, "PRIVATE")
+
+    # private / public object functions, no args
+    assert_equal(functions[0].name.name, "bar_pub")
+    assert_equal(functions[3].name.name, "bar_priv")
+
+    # private object function without leading attribute, no args
+    assert_equal(functions[2].name.name, "bar_priv_default")
+    # private object function without leading attribute, args
+    assert_equal(functions[4].name.name, "test_bar1")
+
+    # with attribute and args
+    assert_equal(functions[1].name.name, "bar_pub1")
+
+    assert_equal(functions[0].fn_type, "obj")
+    assert_equal(functions[7].fn_type, "normal")
 
     obj_vars = tree.all(:ObjVar)
     assert_equal(2, obj_vars.length)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nasl
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Mak Kolybabi
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-05 00:00:00.000000000 Z
+date: 2018-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: racc