[Pydev-cvs] org.python.pydev.parser/src/org/python/pydev/parser PyParser.java, 1.37, 1.38

[Fabio Z. <fa...@us...>]

Update of /cvsroot/pydev/org.python.pydev.parser/src/org/python/pydev/parser
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4734/src/org/python/pydev/parser

Modified Files:
	PyParser.java 
Log Message:
Ok, one more step to the separation, but the regeneration of the grammar is still not completely automatic...

Index: PyParser.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev.parser/src/org/python/pydev/parser/PyParser.java,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** PyParser.java	15 Sep 2006 01:00:27 -0000	1.37
--- PyParser.java	15 Sep 2006 01:19:18 -0000	1.38
***************
*** 6,9 ****
--- 6,12 ----
  package org.python.pydev.parser;
  
+ import static org.python.pydev.core.IPythonNature.GRAMMAR_PYTHON_VERSION_2_4;
+ import static org.python.pydev.core.IPythonNature.GRAMMAR_PYTHON_VERSION_2_5;
+ 
  import java.io.StringReader;
  import java.util.ArrayList;
***************
*** 30,34 ****
  import org.python.pydev.core.docutils.PySelection;
  import org.python.pydev.core.log.Log;
! import org.python.pydev.parser.grammar25.PythonGrammar;
  import org.python.pydev.parser.jython.CharStream;
  import org.python.pydev.parser.jython.FastCharStream;
--- 33,37 ----
  import org.python.pydev.core.docutils.PySelection;
  import org.python.pydev.core.log.Log;
! import org.python.pydev.parser.grammar25.PythonGrammar25;
  import org.python.pydev.parser.jython.CharStream;
  import org.python.pydev.parser.jython.FastCharStream;
***************
*** 40,45 ****
  import org.python.pydev.parser.jython.ast.Module;
  import org.python.pydev.parser.jython.ast.commentType;
- import static org.python.pydev.core.IPythonNature.GRAMMAR_PYTHON_VERSION_2_4;  
- import static org.python.pydev.core.IPythonNature.GRAMMAR_PYTHON_VERSION_2_5;  
  
  /**
--- 43,46 ----
***************
*** 431,438 ****
          
          IParserHost host = new CompilerAPI();
!         PythonGrammar grammar = null;
  
          try {
!         	grammar = new PythonGrammar(in, host, info.grammarVersion);
          	
          	if(ENABLE_TRACING){
--- 432,439 ----
          
          IParserHost host = new CompilerAPI();
!         PythonGrammar25 grammar = null;
  
          try {
!         	grammar = new PythonGrammar25(in, host, info.grammarVersion);
          	
          	if(ENABLE_TRACING){