Commit e59b4d63 authored by Rene Saarsoo's avatar Rene Saarsoo
Browse files

Rename EsprimaParser to JsParser. 

Also rename EsprimaCore to just Esprima.

EsprimaParser is the new JsParser.

Hurray... finally!
parent 39a2a59a

lib/jsduck/esprima_core.rb→lib/jsduck/esprima.rb

+2 −2
Original line number Diff line number Diff line
@@ -4,11 +4,11 @@ require 'singleton' 


module JsDuck



  # Generates AST from JavaScript code by running Esprima.js through V8.

  # Runs Esprima.js through V8.

  #

  # Initialized as singleton to avoid loading the esprima.js more

  # than once - otherwise performace will severely suffer.

  class EsprimaCore

  class Esprima

    include Singleton



    def initialize

lib/jsduck/esprima_parser.rb→lib/jsduck/js_parser.rb

+3 −3
Original line number Diff line number Diff line 
require 'jsduck/esprima_core'

require 'jsduck/esprima'



module JsDuck



  # JavaScript parser that internally uses Esprima.js

  class EsprimaParser

  class JsParser



    # Initializes the parser with JavaScript source code to be parsed.

    def initialize(input, options = {})
@@ -24,7 +24,7 @@ module JsDuck 
    #     }

    #

    def parse

      @ast = EsprimaCore.instance.parse(@input)

      @ast = Esprima.instance.parse(@input)



      @ast["comments"] = merge_comments(@ast["comments"])

      locate_comments

lib/jsduck/source_file_parser.rb

+2 −2
Original line number Diff line number Diff line 
require 'singleton'

require 'jsduck/esprima_parser'

require 'jsduck/js_parser'

require 'jsduck/css_parser'

require 'jsduck/doc_parser'

require 'jsduck/merger'
@@ -42,7 +42,7 @@ module JsDuck 
      if filename =~ /\.s?css$/

        docs = CssParser.new(contents, options).parse

      else

        docs = EsprimaParser.new(contents, options).parse

        docs = JsParser.new(contents, options).parse

        docs = Ast.new(docs).detect_all!

      end

    end

spec/ast_cfg_spec.rb

+2 −2
Original line number Diff line number Diff line 
require "jsduck/ast"

require "jsduck/esprima_parser"

require "jsduck/js_parser"



describe "JsDuck::Ast detecting" do

  def detect(string)

    node = JsDuck::EsprimaParser.new(string).parse[0]

    node = JsDuck::JsParser.new(string).parse[0]

    return JsDuck::Ast.new.detect(node[:code])

  end

spec/ast_class_spec.rb

+2 −2
Original line number Diff line number Diff line 
require "jsduck/ast"

require "jsduck/esprima_parser"

require "jsduck/js_parser"



describe "JsDuck::Ast detects class with" do

  def detect(string)

    node = JsDuck::EsprimaParser.new(string).parse[0]

    node = JsDuck::JsParser.new(string).parse[0]

    return JsDuck::Ast.new.detect(node[:code])

  end