[marf-cvs] marf/src/marf/nlp/Parsing/GrammarCompiler GrammarCompiler.java,1.15,1.16 ProbabilisticGrammarCompiler.java,1.9,1.10

[Serguei A. M. <mo...@us...>]

Update of /cvsroot/marf/marf/src/marf/nlp/Parsing/GrammarCompiler
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4041/marf/nlp/Parsing/GrammarCompiler

Modified Files:
	GrammarCompiler.java ProbabilisticGrammarCompiler.java 
Log Message:
Apply a few more cosmetic fixes. Change a few error outputs to go to
System.err.


Index: GrammarCompiler.java
===================================================================
RCS file: /cvsroot/marf/marf/src/marf/nlp/Parsing/GrammarCompiler/GrammarCompiler.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** GrammarCompiler.java	20 May 2005 04:13:27 -0000	1.15
--- GrammarCompiler.java	24 May 2005 03:24:28 -0000	1.16
***************
*** 11,17 ****
  /**
   * GrammarCompiler.
!  * Compiles source grammar file and produces TT
   */
! public class GrammarCompiler extends StorageManager
  {
  	/**
--- 11,18 ----
  /**
   * GrammarCompiler.
!  * Compiles source grammar file and produces TT.
   */
! public class GrammarCompiler
! extends StorageManager
  {
  	/**
***************
*** 392,396 ****
  				lbUndefNonTerminals = true;
  
! 				System.out.println
  				(
  				   "Undefined non-terminal: " + loNonTerminal.getName() +
--- 393,397 ----
  				lbUndefNonTerminals = true;
  
! 				System.err.println
  				(
  				   "Undefined non-terminal: " + loNonTerminal.getName() +
***************
*** 515,519 ****
  		)
  		{
! 			System.out.println("GrammarCompiler::fillInTransitionTable() - ERROR: Not all grammar elements have been processed.");
  			System.exit(1);
  		}
--- 516,520 ----
  		)
  		{
! 			System.err.println("GrammarCompiler::fillInTransitionTable() - ERROR: Not all grammar elements have been processed.");
  			System.exit(1);
  		}

Index: ProbabilisticGrammarCompiler.java
===================================================================
RCS file: /cvsroot/marf/marf/src/marf/nlp/Parsing/GrammarCompiler/ProbabilisticGrammarCompiler.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** ProbabilisticGrammarCompiler.java	10 May 2005 22:34:15 -0000	1.9
--- ProbabilisticGrammarCompiler.java	24 May 2005 03:24:28 -0000	1.10
***************
*** 5,14 ****
  /**
   * TODO: document and refactor.
!  * 
   * @author Serguei Mokhov
   * @version $Revision$
   * @since 0.3.0
   */
! public class ProbabilisticGrammarCompiler extends GrammarCompiler
  {
  	public ProbabilisticGrammarCompiler(String pstrGrammarFilename)
--- 5,15 ----
  /**
   * TODO: document and refactor.
!  *
   * @author Serguei Mokhov
   * @version $Revision$
   * @since 0.3.0
   */
! public class ProbabilisticGrammarCompiler
! extends GrammarCompiler
  {
  	public ProbabilisticGrammarCompiler(String pstrGrammarFilename)
***************
*** 20,24 ****
  	{
  		System.out.println("Instantiating Probabilistic Grammar Analyzer.");
! 		oGrammarAnalyzer = new ProbabilisticGrammarAnalyzer(this.GrammarFileName);
  	}
  
--- 21,25 ----
  	{
  		System.out.println("Instantiating Probabilistic Grammar Analyzer.");
! 		this.oGrammarAnalyzer = new ProbabilisticGrammarAnalyzer(this.GrammarFileName);
  	}