vorax 0.1.4 → 0.2.0

data/lib/vorax/parser/grammars/package_spec.rl

@@ -12,7 +12,7 @@ action end_identifier {
   @end = p - 1
 }
 
-terminator = (';' ws*) | (ws+ (K_AS | K_IS) ws+);
+terminator = (';' ws*) | (ws+ (K_AS | K_IS | K_DECLARE) ws+);
 id = identifier >start_identifier %end_identifier;
 variable_name = id - (K_CURSOR | K_TYPE | K_FUNCTION | K_PROCEDURE | K_END | K_PRAGMA);
 

data/lib/vorax/parser/plsql_structure.rb

@@ -8,7 +8,7 @@ module Vorax
 
     class Region
 
-      attr_accessor :start_pos, :end_pos
+      attr_accessor :start_pos, :end_pos, :body_start_pos
       attr_reader :name, :type
 
       def initialize(name, type, start_pos = 0, end_pos = 0)
@@ -16,6 +16,7 @@ module Vorax
         @type = type
         @start_pos = start_pos
         @end_pos = end_pos
+      	@body_start_pos = 0
       end
 
       def to_s
@@ -53,6 +54,7 @@ module Vorax
       end
 
       def tree
+				@root.each { |t| t.content.end_pos = @text.length if t.content && t.content.end_pos == 0 }
         @root
       end
       
@@ -106,16 +108,14 @@ module Vorax
             subprog_type = 'PROCEDURE'
           end
           start_pos = scanner.pos - scanner.matched.length
-          region = Region.new(subprog_name, subprog_type, scanner.pos)
+          region = Region.new(subprog_name, subprog_type, start_pos)
           node = Tree::TreeNode.new(region.to_s, region)
           @current_parent << node
-          if @current_parent && @current_parent.content 
-            if @current_parent.content.type != 'SPEC'
-              @level += 1
-              assign_parent(node)
-            else
-              node.content.end_pos = node.content.start_pos
-            end
+          if @current_parent && @current_parent.content && @current_parent.content.type == 'SPEC'
+						node.content.end_pos = node.content.start_pos
+          else
+						@level += 1
+						assign_parent(node)
           end
         end
       end
@@ -126,8 +126,13 @@ module Vorax
           if @begin_level > 1
             # start a new region
             region = Region.new('anonymous', 'BLOCK', scanner.pos)
+            region.body_start_pos = scanner.pos - scanner.matched.length
             @level += 1
             assign_parent(@current_parent << Tree::TreeNode.new(region.to_s, region))
+          else
+          	if @current_parent && @current_parent.content
+							@current_parent.content.body_start_pos = scanner.pos - scanner.matched.length
+						end
           end
         end
       end

data/lib/vorax/version.rb

@@ -2,6 +2,6 @@
 
 module Vorax
 
-  VERSION = '0.1.4' unless defined?(VERSION)
+  VERSION = '0.2.0' unless defined?(VERSION)
 
 end

data/spec/plsql_structure_spec.rb

@@ -4,41 +4,57 @@ include Vorax
 
 describe 'plsql structure' do
 
-  it 'should work for complex plsql code' do
+	before(:each) do# {{{
+		@result = ""
+	end# }}}
+
+	def compute_tree(node, level = 0)# {{{
+		if node.is_root?
+			@result << "*"
+		else
+			@result << "|" unless node.parent.is_last_sibling?
+			@result << (' ' * (node.level - 1) * 4)
+			@result << (node.is_last_sibling? ? "+" : "|")
+			@result << "---"
+			@result << (node.has_children? ? "+" : ">")
+		end
+
+		@result << " #{node.name} - #{(node.content ? node.content.end_pos : '')} -> begin=#{(node.content ? node.content.body_start_pos : '')}\n"
+
+		node.children { |child| compute_tree(child, level + 1)}
+	end# }}}
+
+  it 'should work for complex plsql code' do# {{{
     text = File.open('spec/sql/test.pkg', 'rb') { |file| file.read }
-    #text = File.open('spec/sql/admin_toolkit.bdy', 'rb') { |file| file.read }
     structure = Parser::PlsqlStructure.new(text)
-    @result = ''
-    def compute_tree(node, level = 0)
-      if node.is_root?
-        @result << "*"
-      else
-        @result << "|" unless node.parent.is_last_sibling?
-        @result << (' ' * (node.level - 1) * 4)
-        @result << (node.is_last_sibling? ? "+" : "|")
-        @result << "---"
-        @result << (node.has_children? ? "+" : ">")
-      end
-
-      @result << " #{node.name} - #{(node.content ? node.content.end_pos : '')}\n"
-
-      node.children { |child| compute_tree(child, level + 1)}
-    end
+    compute_tree(structure.tree)
+    @result.should eq(<<STR
+* root -  -> begin=
+|---+ test[SPEC]: 25 - 154 -> begin=0
+|    |---> test[PROCEDURE]: 61 - 61 -> begin=0
+|    +---> muci[FUNCTION]: 91 - 91 -> begin=0
++---+ test[BODY]: 180 - 1173 -> begin=1136
+    |---+ private_proc[PROCEDURE]: 232 - 874 -> begin=454
+|        |---> abc[FUNCTION]: 325 - 392 -> begin=360
+|        +---> xyz[PROCEDURE]: 403 - 449 -> begin=424
+    |---+ test[PROCEDURE]: 879 - 1045 -> begin=911
+|        +---> anonymous[BLOCK]: 967 - 1038 -> begin=962
+    +---> muci[FUNCTION]: 1050 - 1133 -> begin=1104
+STR
+)
+  end# }}}
 
+  it 'should work for a function' do# {{{
+    text = File.open('spec/sql/test.fnc', 'rb') { |file| file.read }
+    structure = Parser::PlsqlStructure.new(text)
     compute_tree(structure.tree)
     @result.should eq(<<STR
-* root - 
-|---+ test[SPEC]: 25 - 154
-|    |---> test[PROCEDURE]: 70 - 70
-|    +---> muci[FUNCTION]: 99 - 99
-|---+ test[BODY]: 180 - 876
-|    |---> private_proc[PROCEDURE]: 241 - 394
-|    +---> xyz[PROCEDURE]: 414 - 451
-|---> test[PROCEDURE]: 890 - 0
-+---> anonymous[BLOCK]: 969 - 1040
+* root -  -> begin=
++---+ test[FUNCTION]: 18 - 134 -> begin=118
+    +---> muci[PROCEDURE]: 78 - 115 -> begin=97
 STR
 )
-  end
+  end# }}}
 
 end
 

data/spec/sql/test.fnc

@@ -0,0 +1,12 @@
+create or replace function test return boolean as
+
+  l_local varchar2(100);
+
+	procedure muci as
+	begin
+		null;
+	end;
+
+begin
+	null;
+end;

data/spec/sql/test.pkg

@@ -17,7 +17,7 @@ create or replace package body test as
     l_var varchar2(100);
 
     /* local function */
-    funzcction abc return boolean as
+    function abc return boolean as
     begin
       return true;
     end;

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vorax
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-17 00:00:00.000000000 Z
+date: 2013-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -98,7 +98,6 @@ files:
 - lib/vorax/output/vertical_convertor.rb
 - lib/vorax/output/zip_convertor.rb
 - lib/vorax/parser/argument.rb~
-- lib/vorax/parser/body_split.rb
 - lib/vorax/parser/conn_string.rb
 - lib/vorax/parser/grammars/alias.rb
 - lib/vorax/parser/grammars/alias.rl
@@ -134,6 +133,7 @@ files:
 - spec/sql/drop_user.sql
 - spec/sql/muci.spc
 - spec/sql/setup_user.sql
+- spec/sql/test.fnc
 - spec/sql/test.pkg
 - spec/sqlplus_spec.rb
 - spec/stmt_inspector_spec.rb
@@ -179,6 +179,7 @@ test_files:
 - spec/sql/drop_user.sql
 - spec/sql/muci.spc
 - spec/sql/setup_user.sql
+- spec/sql/test.fnc
 - spec/sql/test.pkg
 - spec/sqlplus_spec.rb
 - spec/stmt_inspector_spec.rb

data/lib/vorax/parser/body_split.rb

@@ -1,168 +0,0 @@
-# encoding: utf-8
-require 'strscan'
-
-module Vorax
-
-  module Parser
-
-    class SubProgram
-
-      attr_accessor :start_pos, :declare_pos, :end_pos, :text, :level
-      attr_reader :name, :type
-      
-      def initialize(name, type, start_pos)
-        @name = name
-        @type = type
-        @start_pos = start_pos
-        @declare_pos = nil
-        @end_pos = nil
-        @text = ''
-        @level = 0
-      end
-
-    end
-
-    class BodySplit
-
-      PLSQL_SPEC = '(?:\bpackage\b|\btype\b)'
-      SUBPROG = '(?:\bfunction\b|\bprocedure\b)'
-      BEGIN_MODULE = '(?:\bbegin\b)'
-      END_MODULE = '(?:\bend\b)'
-
-      def initialize
-        spots = [BEGIN_ML_COMMENT, BEGIN_SL_COMMENT,
-                BEGIN_PLSQL_SPECIAL_QUOTING, BEGIN_QUOTING,
-                PLSQL_SPEC, SUBPROG, BEGIN_MODULE, END_MODULE]
-        @marks = Regexp.new(spots.join('|'), Regexp::IGNORECASE)
-        @level = 0
-      end
-
-      def split(text)
-        @blocks = []
-        @ss = StringScanner.new(text)
-        @level = 0
-        @crr_block = nil
-        while !@ss.eos?
-          Parser::consume(@ss, :scan_until, @marks)
-          process_ml_comment
-          process_sl_comment
-          process_double_quotes
-          process_plsql_quoting
-          process_single_quotes
-          process_plsql_spec
-          process_subprog
-          process_begin
-          process_end
-        end
-        return @blocks
-      end
-
-      private
-
-      def process_ml_comment
-        scan_until(/\*\/\s*/) if @ss.matched =~ /#{BEGIN_ML_COMMENT}/
-      end
-
-      def process_sl_comment
-        scan_until(/\n/) if @ss.matched =~ /#{BEGIN_SL_COMMENT}/
-      end
-
-      def process_double_quotes
-        scan_until(/"/) if @ss.matched == '"'
-      end
-
-      def process_plsql_quoting
-        if @ss.matched =~ /q'\[/
-          scan_until(/\]'/) 
-        elsif @ss.matched =~ /q'[{]/
-          scan_until(/[}]'/) 
-        elsif @ss.matched =~ /q'[(]/
-          scan_until(/[)]'/) 
-        elsif @ss.matched =~ /q'[<]/
-          scan_until(/[>]'/) 
-        end
-      end
-
-      def process_single_quotes
-        if @ss.matched == "'" 
-          begin
-            scan_until(/\'+/) 
-          end while (@ss.matched != "'" && !@ss.eos?)
-        end
-      end
-
-      def process_plsql_spec
-        if @ss.matched =~ /#{PLSQL_SPEC}/i
-          meta_data = Parser.plsql_spec("#{@ss.matched}#{@ss.rest}")
-          if meta_data[:end_def] > 0
-            spec = SubProgram.new(meta_data[:name], 'spec', @ss.pos)
-            spec.declare_pos = @ss.pos + meta_data[:end_def]
-            scan_until(/#{SLASH_TERMINATOR}/)
-            spec.end_pos = @ss.pos
-            spec.text = @ss.string[(spec.start_pos..spec.end_pos)]
-            @blocks << spec
-          end
-        end
-      end
-
-      def process_subprog
-        if @ss.matched =~ /#{SUBPROG}/i
-          subprog_name = @ss.peek(32)[/(?:"[^"]+")|(?:[A-Z0-9$_#]+)/i]
-          if @ss.matched =~ /function/i
-            subprog_type = 'function'
-          elsif @ss.matched =~ /procedure/i
-            subprog_type = 'procedure'
-          end
-          start_pos = @ss.pos - @ss.matched.length
-          @crr_block = SubProgram.new(subprog_name, subprog_type, start_pos)
-        end
-      end
-
-      def process_begin
-        if @ss.matched =~ /#{BEGIN_MODULE}/i && @crr_block
-          @level += 1
-          @crr_block.declare_pos = @ss.pos 
-          @crr_block.level = @level
-        end
-      end
-
-      def process_end
-        if @ss.matched =~ /#{END_MODULE}/i
-          # we have an "end" match. first of all check if it's not part
-          # of an conditional compiling "$end" definition
-          char_behind = @ss.string[@ss.pos - @ss.matched.length - 1, 1]
-          if char_behind != '$'
-            finish = Parser.end_subprog("#{@ss.matched}#{@ss.rest}")
-            if finish > 0
-              if @level == 1
-                if @crr_block
-                  @crr_block.end_pos = (@ss.pos - 1) + (finish - 1)
-                  @crr_block.text = @ss.string[(@crr_block.start_pos..@crr_block.end_pos)]
-                  @blocks << @crr_block.clone
-                  @crr_block = nil
-                end
-              end
-              @level -= 1
-            end
-          end
-        end
-      end
-
-      def scan_until(regexp, skip = false)
-        if skip
-          @ss.skip_until(regexp)
-        else
-          segment = @ss.scan_until(regexp)
-          if !segment
-            @ss.terminate
-          end
-        end
-      end
-
-    end
-
-  end
-
-end
-
-