Commit 7f56539d authored by Rene Saarsoo's avatar Rene Saarsoo
Browse files

Added support for regex literals to Lexer. 

Additionally supporting numbers now too.
parent b1896127

jsduck.rb

+34 −0
Original line number Diff line number Diff line
@@ -42,6 +42,11 @@ module JsDuck 
            :type => :ident,

            :value => @input.scan(/\w+/)

          }

        elsif @input.check(/[0-9]+/) then

          @tokens << {

            :type => :number,

            :value => eval(@input.scan(/[0-9]+(\.[0-9]*)?/))

          }

        elsif @input.check(/\/\*\*/) then

          @tokens << {

            :type => :doc_comment,
@@ -57,6 +62,18 @@ module JsDuck 
            :type => :string,

            :value => eval(@input.scan(/'([^\\]|\\.)*'/))

          }

        elsif @input.check(/\//) then

          if regex? then

            @tokens << {

              :type => :regex,

              :value => @input.scan(/\/([^\\]|\\.)*\/[gim]*/)

            }

          else

            @tokens << {

              :type => :operator,

              :value => @input.scan(/\//)

            }

          end

        elsif @input.check(/./) then

          @tokens << {

            :type => :operator,
@@ -66,6 +83,23 @@ module JsDuck 
      end

    end



    # A slash "/" is a division operator if it follows:

    # - identifier

    # - number

    # - closing bracket )

    # - closing square-bracket ]

    # Otherwise it's a beginning of regex

    def regex?

      if @tokens.last then

        type = @tokens.last[:type]

        value = @tokens.last[:value]

        if type == :ident || type == :number || value == ")" || value == "]" then

          return false

        end

      end

      return true

    end



    def skip_white_and_comments

      skip_white

      while multiline_comment? || line_comment? do