Seperate grammar(parser) and lexer into 2 classes

opal · Oct 24, 2013 · 689a501 · 689a501
1 parent e6d2a7d
commit 689a501
Show file tree

Hide file tree

Showing 7 changed files with 154 additions and 145 deletions.
diff --git a/lib/opal/compiler.rb b/lib/opal/compiler.rb
@@ -1,10 +1,9 @@
-require 'opal/lexer'
-require 'opal/grammar'
+require 'set'
+require 'opal/parser'
 require 'opal/target_scope'
 require 'opal/version'
 require 'opal/fragment'
 require 'opal/nodes'
-require 'set'
 
 module Opal
   class Compiler
@@ -71,7 +70,7 @@ def compile(source, options = {})
       @source = source
       @options.update options
 
-      @sexp = Grammar.new.parse(@source, self.file)
+      @sexp = Parser.new.parse(@source, self.file)
 
       top_node = Nodes::TopNode.new(@sexp, :expr, self)
       @fragments = top_node.compile_to_fragments.flatten

diff --git a/lib/opal/grammar.rb b/lib/opal/grammar.rb