Commit 60d387be authored by Rene Saarsoo's avatar Rene Saarsoo
Browse files

Replace all uses of Singleton with JsDuck::Util::Singleton.

parent 98f2c788

lib/jsduck/app.rb

+1 −1
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ module JsDuck 
          gw = GuideWriter.new(exporters[@opts.export], @assets.guides, @opts)

          gw.write(@opts.output_dir, ".json")

        end

        Util::Stdout.instance.flush

        Util::Stdout.flush

      else

        FileUtils.rm_rf(@opts.output_dir)

        TemplateDir.new(@opts).write

lib/jsduck/class_writer.rb

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ module JsDuck 


    def write_stdout

      json = Util::Parallel.map(@relations.classes) {|cls| @exporter.export(cls) }.compact

      Util::Stdout.instance.add(json)

      Util::Stdout.add(json)

    end



    def write_dir(dir, extension)

lib/jsduck/esprima.rb

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

require 'json'

require 'singleton'

require 'jsduck/util/singleton'



module JsDuck
@@ -9,7 +9,7 @@ module JsDuck 
  # Initialized as singleton to avoid loading the esprima.js more

  # than once - otherwise performace will severely suffer.

  class Esprima

    include Singleton

    include Util::Singleton



    def initialize

      @v8 = V8::Context.new

lib/jsduck/function_ast.rb

+2 −7
Original line number Diff line number Diff line 
require "singleton"

require "jsduck/util/singleton"

require "jsduck/serializer"

require "jsduck/evaluator"
@@ -6,16 +6,12 @@ module JsDuck 


  # Analyzes the AST of a FunctionDeclaration or FunctionExpression.

  class FunctionAst

    include Singleton

    include Util::Singleton



    # True when function always finishes by returning this.  False

    # doesn't neccessarily mean that the function doesn't return this

    # - rather it means our static analyzes wasn't able to determine

    # what the function returns.

    def self.chainable?(ast)

      FunctionAst.instance.chainable?(ast)

    end



    def chainable?(ast)

      if ast && function?(ast)

        body_returns(ast["body"]["body"])
@@ -101,4 +97,3 @@ module JsDuck 
  end



end

lib/jsduck/guide_writer.rb

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ module JsDuck 


    def write_stdout

      json = ParallelWrap.map(all_guides) {|guide| @exporter.export_guide(guide) }.compact

      Util::Stdout.instance.add(json)

      Util::Stdout.add(json)

    end



    def write_dir(dir, extension)