More removal of positioning code

git-svn-id: http://svn.codehaus.org/jruby/trunk/jruby@9497 961051c9-f516-0410-bf72-c9f7e237a7b7
jruby · Mar 29, 2009 · 7fa3bf4 · 7fa3bf4
1 parent e82b2fa
commit 7fa3bf4
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 46 deletions.
diff --git a/src/org/jruby/lexer/yacc/ISourcePositionFactory.java b/src/org/jruby/lexer/yacc/ISourcePositionFactory.java
diff --git a/src/org/jruby/lexer/yacc/LexerSource.java b/src/org/jruby/lexer/yacc/LexerSource.java
@@ -49,7 +49,7 @@
  */
 public abstract class LexerSource {
 	// Where we get new positions from.
-	private ISourcePositionFactory positionFactory;
+	private SimplePositionFactory positionFactory;
 
     // The name of this source (e.g. a filename: foo.rb)
     private final String sourceName;
@@ -124,10 +124,6 @@ public ISourcePosition getPosition(ISourcePosition startPosition, boolean inclus
     public ISourcePosition getPosition() {
     	return positionFactory.getPosition(null, false);
     }
-
-    public ISourcePositionFactory getPositionFactory() {
-        return positionFactory;
-    }
 
     /**
      * Create a source.

diff --git a/src/org/jruby/lexer/yacc/RubyYaccLexer.java b/src/org/jruby/lexer/yacc/RubyYaccLexer.java
@@ -314,10 +314,6 @@ public StringBuilder getTokenBuffer() {
     public Object value() {
         return yaccValue;
     }
-
-    public ISourcePositionFactory getPositionFactory() {
-        return src.getPositionFactory();
-    }
 
     /**
      * Get position information for Token/Node that follows node represented by startPosition 

diff --git a/src/org/jruby/lexer/yacc/SimplePositionFactory.java b/src/org/jruby/lexer/yacc/SimplePositionFactory.java
@@ -28,7 +28,7 @@
  ***** END LICENSE BLOCK *****/
 package org.jruby.lexer.yacc;
 
-public class SimplePositionFactory implements ISourcePositionFactory {
+public class SimplePositionFactory {
     private LexerSource source;
     private ISourcePosition lastPosition;