[Pydev-cvs] org.python.pydev.parser/src/org/python/pydev/parser PyParser.java, 1.40, 1.41
Brought to you by:
fabioz
From: Fabio Z. <fa...@us...> - 2006-09-17 12:43:59
|
Update of /cvsroot/pydev/org.python.pydev.parser/src/org/python/pydev/parser In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2223/src/org/python/pydev/parser Modified Files: PyParser.java Log Message: The project change for the grammar will now affect the parsing for open editors Index: PyParser.java =================================================================== RCS file: /cvsroot/pydev/org.python.pydev.parser/src/org/python/pydev/parser/PyParser.java,v retrieving revision 1.40 retrieving revision 1.41 diff -C2 -d -r1.40 -r1.41 *** PyParser.java 16 Sep 2006 13:16:25 -0000 1.40 --- PyParser.java 17 Sep 2006 12:43:57 -0000 1.41 *************** *** 24,27 **** --- 24,28 ---- import org.eclipse.ui.IFileEditorInput; import org.python.pydev.core.ExtensionHelper; + import org.python.pydev.core.IGrammarVersionProvider; import org.python.pydev.core.IPyEdit; import org.python.pydev.core.IPythonNature; *************** *** 117,127 **** * This is the version of the grammar that should be used for this parser */ ! private int grammarVersion; /** * should only be called for testing. does not register as a thread */ ! public PyParser(int grammarVersion) { ! this.grammarVersion = grammarVersion; parserListeners = new ArrayList<IParserObserver>(); scheduler = new ParserScheduler(this); --- 118,128 ---- * This is the version of the grammar that should be used for this parser */ ! private IGrammarVersionProvider grammarVersionProvider; /** * should only be called for testing. does not register as a thread */ ! public PyParser(IGrammarVersionProvider grammarVersionProvider) { ! this.grammarVersionProvider = grammarVersionProvider; parserListeners = new ArrayList<IParserObserver>(); scheduler = new ParserScheduler(this); *************** *** 155,159 **** */ public PyParser(IPyEdit editorView) { ! this(editorView.getPythonNature().getGrammarVersion()); this.editorView = editorView; } --- 156,160 ---- */ public PyParser(IPyEdit editorView) { ! this(editorView.getPythonNature()); this.editorView = editorView; } *************** *** 299,303 **** //get the document ast and error in object ! Tuple<SimpleNode, Throwable> obj = reparseDocument(new ParserInfo(document, true, grammarVersion)); IFile original = null; --- 300,304 ---- //get the document ast and error in object ! Tuple<SimpleNode, Throwable> obj = reparseDocument(new ParserInfo(document, true, grammarVersionProvider.getGrammarVersion())); IFile original = null; |