fdlint 0.1.3 → 0.2.0.pre

data/lib/{css/parser.rb → fdlint/parser/css/css_parser.rb}

@@ -1,29 +1,31 @@
-require_relative '../base_parser'
 require_relative 'struct'
 
-module XRay
+module Fdlint; module Parser
+
   module CSS
     
-    class Parser < XRay::BaseParser
-      TERM = %q([^;{}'"])
-      TERM2 = %q([^;{}'",])
-      QUOT_EXPR = "'[^']*'"
-      DQUOT_EXPR = '"[^"]*"'
+    class CssParser < ::Fdlint::Parser::BaseParser
+
+      include ::Fdlint::Parser::ParserVisitable
 
-      R_IDENT = /-?[_a-z][_a-z0-9-]*/
-      R_ANY = %r"((?:#{TERM})|(?:#{QUOT_EXPR})|(?:#{DQUOT_EXPR}))+"
+      TERM       = %q([^;{}'"])
+      TERM2      = %q([^;{}'",])
+      QUOT_EXPR  = "'[^']*'"
+      DQUOT_EXPR = '"[^"]*"'
+      R_IDENT    = /-?[_a-z][_a-z0-9-]*/
+      R_ANY      = %r"((?:#{TERM})|(?:#{QUOT_EXPR})|(?:#{DQUOT_EXPR}))+"
       R_SELECTOR = %r"((?:#{TERM2})|(?:#{QUOT_EXPR})|(?:#{DQUOT_EXPR}))+"
       R_PROPERTY = /[*_+\\]?-?[_a-z\\][\\_a-z0-9-]*/
       
       attr_reader :comments
 
-      def initialize(css, logger)
+      def initialize(css)
         super
         @comments = []
       end
 
       def parse_stylesheet(inner = false)
-        log 'parse stylesheet'
+        debug { 'parse stylesheet' }
         
         do_parse_comment
 
@@ -39,7 +41,7 @@ module XRay
 
       # ruleset or directive
       def parse_statement
-        log 'parse statement'
+        debug { 'parse statement' }
 
         if check /@/
           parse_directive
@@ -49,7 +51,7 @@ module XRay
       end
 
       def parse_directive
-        log 'parse directive'
+        debug { 'parse directive' }
 
         skip /@/
         keyword = scan R_IDENT 
@@ -69,14 +71,14 @@ module XRay
           skip /;/ 
         end
 
-        log "  keyword: #{keyword} #{keyword.position}"
-        log("  expression: #{expr} #{expr.position}") if expr
-        log("  block:\n#{block}\n#{block.position}") if block
+        debug { "  keyword: #{keyword} #{keyword.position}" }
+        debug { "  expression: #{expr} #{expr.position}" } if expr
+        debug { "  block:\n#{block}\n#{block.position}"  } if block
         Directive.new keyword, expr, block
       end
       
       def parse_ruleset
-        log 'parse ruleset'
+        debug { 'parse ruleset' }
 
         selector = check(/\{/) ? nil : parse_selector
         skip /\{/
@@ -87,15 +89,15 @@ module XRay
       end
       
       def parse_selector
-        log ' parse selector'
+        debug { ' parse selector' }
         simple_selectors = batch(:parse_simple_selector, /\{/, /,/)
         Selector.new simple_selectors
       end
 
       def parse_simple_selector
-        log '  parse simple selector'
         selector = scan R_SELECTOR 
-        log "   #{selector} #{selector.position}"
+        debug { '  parse simple selector' }
+        debug { "   #{selector} #{selector.position}" }
         selector
       end
       
@@ -113,7 +115,7 @@ module XRay
       end
       
       def parse_declaration
-        log '   parse declaration'
+        debug { '   parse declaration' }
         
         property = parse_property
         skip /:/
@@ -123,24 +125,24 @@ module XRay
       end
       
       def parse_property
-        log '    parse property'
+        debug { '    parse property' }
         property = scan R_PROPERTY 
-        log "     #{property} #{property.position}"
+        debug { "     #{property} #{property.position}" }
         property
       end
       
       def parse_value
-        log '    parse value'
+        debug { '    parse value' }
 
         value = scan R_ANY 
-        log "     #{value} #{value.position}"
+        debug { "     #{value} #{value.position}" }
         value 
       end
 
       def parse_comment
-        log 'pare comment'
+        debug { 'pare comment' }
         comment =  raw_scan /\/\*[^*]*\*+([^\/*][^*]*\*+)*\//
-        log "  #{comment}" 
+        debug { "  #{comment}" }
         comment
       end
      
@@ -183,4 +185,5 @@ module XRay
     end
     
   end
-end
+
+end; end

data/lib/{css → fdlint/parser/css}/struct.rb

@@ -1,8 +1,7 @@
-require_relative '../node'
-
-module XRay
+module Fdlint; module Parser
   module CSS
-    Node = XRay::Node
+
+    Node = ::Fdlint::Parser::Node
     
     class StyleSheet < Node
       attr_reader :statements
@@ -108,4 +107,5 @@ module XRay
     end
 
   end
-end
+
+end; end

data/lib/{encoding_error.rb → fdlint/parser/encoding_error.rb}

@@ -1,6 +1,6 @@
-module XRay
+module Fdlint; module Parser
 
   class EncodingError < RuntimeError
   end
 
-end
+end; end

data/lib/{html/parser.rb → fdlint/parser/html/html_parser.rb}

@@ -1,11 +1,13 @@
-require_relative '../base_parser'
-require_relative '../css/parser'
-require_relative '../js/parser'
-require_relative 'struct'
+require 'fdlint/parser/base_parser'
+require 'fdlint/parser/css/css_parser'
+require 'fdlint/parser/js/js_parser'
+require 'fdlint/parser/html/struct'
 
-module XRay; module HTML
+module Fdlint; module Parser; module HTML
 
-  class Parser < BaseParser
+  class HtmlParser < ::Fdlint::Parser::BaseParser
+
+    include ::Fdlint::Parser::ParserVisitable
 
     def self.parse(src, &block)
       parser = self.new(src)
@@ -36,12 +38,13 @@ module XRay; module HTML
         when 0 then nil
         when 1 then nodes[0]
         else 
-          ::XRay::HTML::Document.new( nodes )
+          ::Fdlint::Parser::HTML::Document.new( nodes )
       end
     end
 
     def parse_element
       if @scanner.check(DTD) and !@dtd_checked
+        # only one DTD for one document
         @dtd_checked = true
         parse_dtd
       elsif @scanner.check(COMMENT)
@@ -49,7 +52,7 @@ module XRay; module HTML
       elsif @scanner.check(TAG_START)
         parse_tag
       elsif !text_end?
-        parse_text
+        parse_text_tag
       else
         parse_error('Invalid HTML struct')
       end
@@ -65,8 +68,9 @@ module XRay; module HTML
       CommentElement.new(@scanner[1])
     end
 
-    def parse_text
+    def parse_text_tag
       text = ''
+      pos  = scanner_pos
       until text_end? do
         text << '<' if @scanner.skip(/</)
         text << "#{@scanner.scan(TEXT)}"
@@ -74,7 +78,9 @@ module XRay; module HTML
         # TODO: make this detection a rule
         parse_warn "'#{$~}' not escaped" if text =~ /<|>/
       end
-      TextElement.new text
+      TextElement.new( text ).tap do |text|
+        text.position = pos
+      end
     end
 
     def parse_tag
@@ -137,7 +143,7 @@ module XRay; module HTML
       begin
         end_tag = %r(<#{tag.text.sub(/^(?!=\/)/, '\/')}>)i
       rescue
-        raise ::XRay::ParseError.new("invalid tag name: #{tag.text}", scanner_pos)
+        raise ::Fdlint::Parser::ParseError.new("invalid tag name: #{tag.text}", scanner_pos)
       end
 
       if auto_close?(tag.text) and !@scanner.check(end_tag)
@@ -159,7 +165,7 @@ module XRay; module HTML
 
       scopes.pop
 
-      el = Element.new(tag, prop, children, close_type, ending)
+      el = Tag.new(tag, prop, children, close_type, ending)
       el.scopes = scopes.dup
       el
     end
@@ -183,7 +189,7 @@ module XRay; module HTML
     end
 
     def auto_close?(tag)
-      XRay::HTML::AUTO_CLOSE_TAGS.include?(tag.to_s.downcase)
+      Fdlint::Parser::HTML::AUTO_CLOSE_TAGS.include?(tag.to_s.downcase)
     end
 
     def text_end?
@@ -200,13 +206,13 @@ module XRay; module HTML
   end
 
 
-end; end
+end; end; end
 
 if __FILE__ == $0
-  XRay::HTML::Parser.parse(%q(<div class="info" checked>information</div>)) { |e| puts e.outer_html }
-  XRay::HTML::Parser.parse(%q(<img width="100" height='150' id=img > <center>text</center>)) { |e| puts e.first.outer_html }
-  XRay::HTML::Parser.parse(%q(<center><div><div><center>text</center></div></div></center>)) { |e| puts e.outer_html }
-  XRay::HTML::Parser.parse(%q(<center ns:name="value"><div><div><center>text</center></div></div></center>)) { |e| puts e.outer_html }
-  begin; XRay::HTML::Parser.parse(%q(<center><div></center></div>)) { |e| puts e.outer_html }; rescue; end
-  XRay::HTML::Parser.parse('<br/>') { |e| puts e.outer_html }
+  Fdlint::Parser::HTML::HtmlParser.parse(%q(<div class="info" checked>information</div>)) { |e| puts e.outer_html }
+  Fdlint::Parser::HTML::HtmlParser.parse(%q(<img width="100" height='150' id=img > <center>text</center>)) { |e| puts e.first.outer_html }
+  Fdlint::Parser::HTML::HtmlParser.parse(%q(<center><div><div><center>text</center></div></div></center>)) { |e| puts e.outer_html }
+  Fdlint::Parser::HTML::HtmlParser.parse(%q(<center ns:name="value"><div><div><center>text</center></div></div></center>)) { |e| puts e.outer_html }
+  begin; Fdlint::Parser::HTML::HtmlParser.parse(%q(<center><div></center></div>)) { |e| puts e.outer_html }; rescue; end
+  Fdlint::Parser::HTML::HtmlParser.parse('<br/>') { |e| puts e.outer_html }
 end

data/lib/{html → fdlint/parser/html}/struct.rb

@@ -1,9 +1,8 @@
-require_relative '../node'
-
-module XRay
+module Fdlint; module Parser
   module HTML
 
-    Node = XRay::Node
+    Node = ::Fdlint::Parser::Node
+
     AUTO_CLOSE_TAGS = %w(area base basefont br col frame hr img input link meta param) 
     INLINE_ELEMENTS = %w(a br label abbr legend address link 
                          area mark audio meter bm nav cite optgroup 
@@ -11,21 +10,53 @@ module XRay
                          command source datalist span em strong 
                          font sub i summary iframe sup img tbody 
                          input td ins time kbd var)
+    module Matchable
+      def =~ patten
+        if name
+          case patten
+          when String
+            name =~ Regexp.new("^#{patten}$", Regexp::IGNORECASE)
+          when Regexp
+            name =~ patten
+          end
+        end
+      end
+
+      alias_method :name_equal?, :=~
+
+    end
+
 
     class Element < Node
 
+      include Matchable
+
       attr_reader :tag, :props, :children
-      attr_accessor :parent, :close_type, :ending, :scopes
+      attr_accessor :position, :parent, :close_type, :ending, :scopes
 
       def initialize(tag, props=[], children=[], close_type=:after, ending=nil)
-        @tag, @props, @children, @close_type, @ending = tag, to_props(props), Array.[](children).flatten || [], close_type, ending
-        @position = @tag.position.dup if tag.is_a?(Node) and tag.position
-        @children.each { |el| el.parent = self }
+
+        @tag, @close_type, @ending = tag, close_type, ending
+        @props  = to_props( props )
         @scopes = []
+
+        if tag.respond_to?( :position ) and tag.position
+          @position = @tag.position.dup
+        end
+
+        @children = (Array.[](children).flatten || []).tap do |children|
+          children.each do |child|
+            child.parent = self
+          end
+        end
       end
 
       def has_scope?
-        !(parent.nil? and @scopes.empty?)
+        !top_level?
+      end
+
+      def top_level?
+        parent.nil? and @scopes.empty?
       end
 
       def in_scope?(scp)
@@ -37,19 +68,13 @@ module XRay
       end
 
       def text
-        children.inject("") do |s,child|
-          s + child.text
-        end
+        children.inject("") { |s,child| s + child.text }
       end
 
       def tag_name
         @tag.is_a?(Node) ? @tag.text : @tag.to_s
       end
 
-      def tag_name_equal?(name)
-        tag_name.downcase == name.downcase
-      end
-
       def inner_html
         @children.inject('') { |s,c| s + c.outer_html }
       end
@@ -98,6 +123,10 @@ module XRay
         end
       end
 
+      def [] name
+        prop_value(name)
+      end
+
       def to_s
         "[HTML: #{outer_html}]"
       end
@@ -111,7 +140,7 @@ module XRay
       end
 
       def closed?
-        @close_type != :none
+        auto_close? && !self_closed? || @close_type != :none
       end
 
       def self_closed?
@@ -126,30 +155,41 @@ module XRay
         false
       end
 
-      protected
-      def parse(text)
-        @outer_html = text
+      def stylesheet_link?
+        self =~ 'link' && self['rel'] =~ /stylesheet/i
       end
 
+      protected
+
+        def parse(text)
+          @outer_html = text
+        end
+
       private
 
-      def to_props(src)
-        case src
-          when Array
-            src
-          when Hash
-            src.map do |n, v|
-              Property.new(n, v)
+        def to_props(src)
+          case src
+            when Array
+              src
+            when Hash
+              src.map do |n, v|
+                Property.new(n, v)
+              end
+            else
+              []
             end
-          else
-            []
-          end
-      end
+        end
 
     end
 
+    class Tag < Element
+      include Matchable
+
+      alias_method :name, :tag_name
+    end
+
+    class Document < Tag
 
-    class Document < Element
       def initialize( children=[] )
         super(nil, {}, children || [])
         @position = Position.new(0,0,0)
@@ -169,9 +209,15 @@ module XRay
         children.empty?
       end
 
+      def has_dtd?
+        !empty? && children.first.is_a?( DTDElement )
+      end
+
+      alias_method :have_dtd?, :has_dtd?
+
     end
 
-    class TextElement < Element
+    class TextElement < Tag
 
       def initialize(text="")
         super(nil)
@@ -263,6 +309,8 @@ module XRay
 
     class Property < Node
 
+      include Matchable
+
       attr_reader :name, :sep
       attr_accessor :value
 
@@ -272,10 +320,6 @@ module XRay
 
       def position; name.position; end
 
-      def name_equal?(text)
-        @name.to_s.downcase == text.to_s.downcase
-      end
-
       def to_s
         if value.nil?
           name.to_s
@@ -288,4 +332,4 @@ module XRay
 
 
   end
-end
+end; end

data/lib/fdlint/parser/js/expr/expr.rb

@@ -0,0 +1,71 @@
+require 'fdlint/parser/js/expr/primary'
+require 'fdlint/parser/js/expr/left_hand'
+require 'fdlint/parser/js/expr/operate'
+
+
+module Fdlint
+  module Parser
+    module JS
+      module Expr 
+
+        module Expr
+
+          include ::Fdlint::Parser::JS::Expr::Primary
+          include ::Fdlint::Parser::JS::Expr::LeftHand
+          include ::Fdlint::Parser::JS::Expr::Operate
+          
+          def parse_expression
+            log 'parse expression'
+            parse_expr_with_operate :parse_expr_assignment, /,/ 
+          end
+
+          def parse_expr_assignment
+            log 'parse expr assignment'
+
+            expr = parse_expr_condition
+
+            r = /=|\*=|\/=|%=|\+=|-=|<<=|>>=|>>>=|&=|\^=|\|=/
+            if expr.left_hand? && check(r)
+              op = scan r
+              expr = create_element Expression, op.text, expr, parse_expr_assignment
+            end
+            expr
+          end
+
+          def parse_expr_condition
+            log 'parse expr condition'
+            expr = parse_expr_logical_or
+            if check /\?/
+              skip /\?/
+              left = parse_expr_assignment
+              skip /:/
+              right = parse_expr_assignment
+
+              expr = create_element ConditionExpression, expr, left, right
+            end
+            expr
+          end
+
+          def parse_expr_with_operate(left, pattern = nil, &block)
+            block = block || lambda {
+              if check pattern
+                skip_empty
+                before_pos = scanner_pos
+                op = scan pattern
+                [op.text, self.send(left), before_pos]
+              end
+            }
+
+            expr = self.send left
+            while (ret = block.call) 
+              expr = create_element Expression, ret[0], expr, ret[1], ret[2]
+            end 
+            expr
+          end
+           
+        end
+
+      end
+    end
+  end
+end

data/lib/fdlint/parser/js/expr/left_hand.rb

@@ -0,0 +1,65 @@
+module Fdlint
+  module Parser
+    module JS
+      module Expr
+        
+        module LeftHand
+          
+          def parse_expr_lefthand
+            log 'parse expr lefthand'
+            expr = check(/new\b/) ? parse_expr_new : parse_expr_member
+            expr.left_hand = true
+            expr 
+          end 
+
+          def parse_expr_new
+            log 'parse expr new'
+
+            pos = skip /new/
+            expr = check(/new\b/) ? parse_expr_new : parse_expr_member
+            args = check(/\(/) ? parse_arguments_list : nil
+
+            create_element Expression, 'new', expr, args, pos
+          end
+
+          def parse_expr_member
+            log 'parse expr member'
+            parse_expr_with_operate(:parse_expr_member_left) do
+              if check /[.]/
+                skip /[.]/
+                ['.', parse_expr_identifier]
+              elsif check /[\[]/
+                skip /\[/
+                expr = parse_expression
+                skip /\]/
+                ['[', expr]
+              elsif check /\(/
+                ['(', parse_arguments_list]
+              end
+            end
+          end
+
+          protected
+
+          def parse_expr_member_left
+            if check /function\b/
+              create_element FunctionExpression, parse_function_declaration(true)
+            else
+              parse_expr_primary
+            end 
+          end
+
+
+          def parse_arguments_list
+            log 'parse arguments list'
+            skip /\(/
+            params = batch :parse_expr_assignment, /\)/, /,/
+            skip /\)/
+            Elements.new params
+          end
+
+        end
+      end
+    end
+  end
+end