Simplify and unify how native code (JavaScript, Java, C) is loaded. M…

…otivation: easier to run test suite over different native impls.

java/src/main/java/gherkin/parser/Parser.java

@@ -54,8 +54,11 @@ public void parse(String gherkin, String featureURI, Integer lineOffset) {
         this.featureURI = featureURI;
         this.lineOffset = lineOffset;
         pushMachine(machineName);
-        lexer.scan(gherkin);
-        popMachine();
+        try {
+            lexer.scan(gherkin);
+        } finally {
+            popMachine();
+        }
     }
 
     public I18n getI18nLanguage() {

lib/gherkin/i18n.rb

@@ -114,13 +114,8 @@ def c(listener)
     end
 
     def rb(listener)
-      require 'gherkin/rb_lexer'
-      RbLexer[underscored_iso_code].new(listener)
-    end
-
-    def js(listener)
-      require 'gherkin/js_lexer'
-      JsLexer[underscored_iso_code].new(listener)
+      require "gherkin/rb_lexer/#{underscored_iso_code}"
+      RbLexer.const_get(underscored_iso_code.capitalize).new(listener)
     end
 
     def underscored_iso_code

lib/gherkin/native/therubyracer.rb

@@ -5,7 +5,8 @@ def native_impl(lib)
     class << self
       def new(*args)
         js = {
-          'Gherkin::Formatter::JSONFormatter' => 'js/lib/gherkin/formatter/json_formatter.js'
+          'Gherkin::Formatter::JSONFormatter' => 'js/lib/gherkin/formatter/json_formatter.js',
+          'Gherkin::RbLexer::En' => 'js/lib/gherkin/lexer/en.js'
         }[self.name]
         if(js)
           Proxy.new(js, *args)

lib/gherkin/parser/parser.rb

@@ -21,14 +21,18 @@ def initialize(formatter, raise_on_error=true, machine_name='root', force_ruby=f
         @raise_on_error = raise_on_error
         @machine_name = machine_name
         @machines = []
-        push_machine(@machine_name)
         @lexer = Gherkin::Lexer::I18nLexer.new(self, force_ruby)
       end
 
       def parse(gherkin, feature_uri, line_offset)
         @formatter.uri(feature_uri)
         @line_offset = line_offset
-        @lexer.scan(gherkin)
+        push_machine(@machine_name)
+        begin
+          @lexer.scan(gherkin)
+        ensure
+          pop_machine
+        end
       end
 
       def i18n_language
@@ -39,17 +43,14 @@ def errors
         @lexer.errors
       end
 
-      # Doesn't yet fall back to super
-      def method_missing(method, *args)
-        # TODO: Catch exception and call super
-        event(method.to_s, args[-1])
-        @listener.__send__(method, *args)
-        if method == :eof
-          pop_machine
-          push_machine(@machine_name)
+      [:comment, :tag, :feature, :background, :scenario, :scenario_outline, :examples, :step, :doc_string, :row, :eof].each do |m|
+        define_method(m) do |*args|
+          if(event(m.to_s, args[-1]))
+            @listener.__send__(m, *args)
+          end
         end
       end
-
+      
       def event(ev, line)
         l = line ? @line_offset+line : nil
         machine.event(ev, l) do |state, legal_events|

ragel/lexer.js.rl.erb

@@ -135,7 +135,7 @@ var Lexer = function(listener) {
   for(e in events) {
     var event = events[e];
     if(typeof listener[event] != 'function') {
-      "Error. No " + event + " function exists on " + JSON.stringify(listener);
+      throw "Error. No " + event + " function exists on " + JSON.stringify(listener);
     }
   }
   this.listener = listener;  
@@ -208,8 +208,8 @@ Lexer.prototype.current_line_content = function(data, p) {
 };
 
 // Node.js export
-if(typeof exports !== 'undefined') {
-  exports.Lexer = Lexer;
+if(typeof module !== 'undefined') {
+  module.exports = Lexer;
 }
 // Require.js export
 if (typeof define !== 'undefined') {
@@ -224,4 +224,4 @@ if (typeof define !== 'undefined') {
   }
 }
 
-})();
+})();

ragel/lexer.rb.rl.erb

@@ -1,8 +1,10 @@
-require 'gherkin/lexer/i18n_lexer'
+require 'gherkin/native'
 
 module Gherkin
   module RbLexer
     class <%= @i18n.underscored_iso_code.capitalize %> #:nodoc:
+      native_impl('gherkin')
+
       %%{
         machine lexer;