[marf-cvs] marf/src/marf/nlp/Parsing/GrammarCompiler Grammar.java, 1.21, 1.22 GrammarAnalyzer.java,

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 454-5900

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

Modified Files:
	Grammar.java GrammarAnalyzer.java GrammarCompiler.java 
	GrammarElement.java NonTerminal.java 
	ProbabilisticGrammarAnalyzer.java 
	ProbabilisticGrammarTokenType.java 
Log Message:
Primarily, spellcheck some comments in the NLP tree.

Index: ProbabilisticGrammarAnalyzer.java
===================================================================
RCS file: /cvsroot/marf/marf/src/marf/nlp/Parsing/GrammarCompiler/ProbabilisticGrammarAnalyzer.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** ProbabilisticGrammarAnalyzer.java	19 Jan 2006 04:13:17 -0000	1.15
--- ProbabilisticGrammarAnalyzer.java	18 Dec 2007 21:37:57 -0000	1.16
***************
*** 11,15 ****

  /**
!  * <p>Pobabilistic Grammar Analyzer -- an lexical analyzer designed
   * for probabilistic grammars out of a stream of characters.</p>
   *
--- 11,15 ----

  /**
!  * <p>Probabilistic Grammar Analyzer -- an lexical analyzer designed
   * for probabilistic grammars out of a stream of characters.</p>
   *
***************
*** 35,39 ****
  	/**
  	 * Initializes this grammar analyzer and sets the stream
! 	 * tokenizer to regonize numerical values specially and
  	 * don't fold anything to lowercase.
  	 * @return <code>true</code> if parent's initialization was successful
--- 35,39 ----
  	/**
  	 * Initializes this grammar analyzer and sets the stream
! 	 * tokenizer to recognize numerical values specially and
  	 * don't fold anything to lowercase.
  	 * @return <code>true</code> if parent's initialization was successful
***************
*** 51,55 ****

  	/**
! 	 * Creates a propabilistic token type as a part of
  	 * the grammar.
  	 */
--- 51,55 ----

  	/**
! 	 * Creates a probabilistic token type as a part of
  	 * the grammar.
  	 */
***************
*** 64,68 ****
  	 * Creates an instance of the next token in the grammar
  	 * token stream given integer token type. The token type
! 	 * is determined from the undelying stream tokenizer.
  	 * @throws LexicalError if there was an error reading off the token
  	 * @see marf.nlp.Parsing.GrammarCompiler.GrammarAnalyzer#createNextToken()
--- 64,68 ----
  	 * Creates an instance of the next token in the grammar
  	 * token stream given integer token type. The token type
! 	 * is determined from the underlying stream tokenizer.
  	 * @throws LexicalError if there was an error reading off the token
  	 * @see marf.nlp.Parsing.GrammarCompiler.GrammarAnalyzer#createNextToken()

Index: GrammarCompiler.java
===================================================================
RCS file: /cvsroot/marf/marf/src/marf/nlp/Parsing/GrammarCompiler/GrammarCompiler.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** GrammarCompiler.java	19 Jan 2006 04:13:17 -0000	1.29
--- GrammarCompiler.java	18 Dec 2007 21:37:57 -0000	1.30
***************
*** 37,41 ****
  	/**
  	 * Action for adding a next token to the RHS of
! 	 * the curren rule signifing to stop.
  	 * @since 0.3.0.5
  	 */
--- 37,41 ----
  	/**
  	 * Action for adding a next token to the RHS of
! 	 * the current rule signifying to stop.
  	 * @since 0.3.0.5
  	 */
***************
*** 44,48 ****
  	/**
  	 * Action for adding a next token to the RHS of
! 	 * the curren rule signifing to continue and skip
  	 * to the next token.
  	 * @since 0.3.0.5
--- 44,48 ----
  	/**
  	 * Action for adding a next token to the RHS of
! 	 * the current rule signifying to continue and skip
  	 * to the next token.
  	 * @since 0.3.0.5
***************
*** 52,56 ****
  	/**
  	 * Action for adding a next token to the RHS of
! 	 * the curren rule signifing to proceed to add the
  	 * current token to the RHS.
  	 * @since 0.3.0.5
--- 52,56 ----
  	/**
  	 * Action for adding a next token to the RHS of
! 	 * the current rule signifying to proceed to add the
  	 * current token to the RHS.
  	 * @since 0.3.0.5
***************
*** 150,154 ****
  	/**
  	 * Compiles grammar.
! 	 * Compilation consitis of parsing source grammar file,
  	 * creating rules, Terminals, Non-Terminals; then computes
  	 * first and follow sets, and fills in a TransitionTable data structure.
--- 150,154 ----
  	/**
  	 * Compiles grammar.
! 	 * Compilation consists of parsing source grammar file,
  	 * creating rules, Terminals, Non-Terminals; then computes
  	 * first and follow sets, and fills in a TransitionTable data structure.
***************
*** 186,190 ****
  		this.oGrammar.addTeminal(oEpsilon);

! 		// Set the reference to epslion
  		this.oGrammar.setEpsilonTerminal(oEpsilon);
  	}
--- 186,190 ----
  		this.oGrammar.addTeminal(oEpsilon);

! 		// Set the reference to epsilon
  		this.oGrammar.setEpsilonTerminal(oEpsilon);
  	}
***************
*** 193,197 ****
  	 * Creates the next non-terminal of a rule from the upcoming
  	 * token.
! 	 * @return <code>true</code> if the token was creater; and <code>false</code>
  	 * if the end of file was reached
  	 * @throws CompilerError -- either a <code>SyntaxError</code> or <code>LexicalError</code>
--- 193,197 ----
  	 * Creates the next non-terminal of a rule from the upcoming
  	 * token.
! 	 * @return <code>true</code> if the token was created; and <code>false</code>
  	 * if the end of file was reached
  	 * @throws CompilerError -- either a <code>SyntaxError</code> or <code>LexicalError</code>
***************
*** 489,493 ****
  	/**
  	 * Dies on unexpected grammar token type.
! 	 * @throws SyntaxError indicated unepected token type.
  	 */
  	protected void getBusted()
--- 489,493 ----
  	/**
  	 * Dies on unexpected grammar token type.
! 	 * @throws SyntaxError indicated unexpected token type.
  	 */
  	protected void getBusted()
***************
*** 516,520 ****
  	/**
  	 * Checks for undefined non-terminals in the grammar.
! 	 * @throws SemanticError if there were undefied non-terminals
  	 */
  	protected void checkUndefinedNonTerminals()
--- 516,520 ----
  	/**
  	 * Checks for undefined non-terminals in the grammar.
! 	 * @throws SemanticError if there were undefined non-terminals
  	 */
  	protected void checkUndefinedNonTerminals()
***************
*** 838,842 ****
  								System.out.println("Rule in the table cell: " + loCellRule.toAbbrString() + ": " + loCellRule.toString());
  								System.out.println("Overwriting Rule      : " + loRule.toAbbrString() + ": " + loRule.toString());
! 								System.out.println("This means there are ambiguites in the source grammar.");
  								System.out.println("Please remove them and restart grammar compilation.");
  								//System.exit(1);
--- 838,842 ----
  								System.out.println("Rule in the table cell: " + loCellRule.toAbbrString() + ": " + loCellRule.toString());
  								System.out.println("Overwriting Rule      : " + loRule.toAbbrString() + ": " + loRule.toString());
! 								System.out.println("This means there are ambiguities in the source grammar.");
  								System.out.println("Please remove them and restart grammar compilation.");
  								//System.exit(1);
***************
*** 895,899 ****
  									System.out.println("Rule in the table cell: " + loCellRule.toAbbrString() + ": " + loCellRule.toString());
  									System.out.println("Overwriting Rule      : " + loRule.toAbbrString() + ": " + loRule.toString());
! 									System.out.println("This means there are ambiguites in the source grammar.");
  									System.out.println("Please remove them and restart grammar compilation.");
  									//System.exit(1);
--- 895,899 ----
  									System.out.println("Rule in the table cell: " + loCellRule.toAbbrString() + ": " + loCellRule.toString());
  									System.out.println("Overwriting Rule      : " + loRule.toAbbrString() + ": " + loRule.toString());
! 									System.out.println("This means there are ambiguities in the source grammar.");
  									System.out.println("Please remove them and restart grammar compilation.");
  									//System.exit(1);

Index: ProbabilisticGrammarTokenType.java
===================================================================
RCS file: /cvsroot/marf/marf/src/marf/nlp/Parsing/GrammarCompiler/ProbabilisticGrammarTokenType.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** ProbabilisticGrammarTokenType.java	19 Jan 2006 04:13:17 -0000	1.11
--- ProbabilisticGrammarTokenType.java	18 Dec 2007 21:37:57 -0000	1.12
***************
*** 2,6 ****

  /**
!  * Probabilistic Grammar Toke Type.
   *
   * $Id$
--- 2,6 ----

  /**
!  * <p>Probabilistic Grammar Token Type.</p>
   *
   * $Id$
***************
*** 8,17 ****
   * @author Serguei Mokhov
   * @version $Revision$
!  * @since 0.3.0
   */
  public class ProbabilisticGrammarTokenType
  extends GrammarTokenType
  {
!     /**
  	 * For serialization versioning.
  	 * When adding new members or make other structural
--- 8,17 ----
   * @author Serguei Mokhov
   * @version $Revision$
!  * @since 0.3.0.2
   */
  public class ProbabilisticGrammarTokenType
  extends GrammarTokenType
  {
! 	/**
  	 * For serialization versioning.
  	 * When adding new members or make other structural

Index: GrammarElement.java
===================================================================
RCS file: /cvsroot/marf/marf/src/marf/nlp/Parsing/GrammarCompiler/GrammarElement.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** GrammarElement.java	15 Dec 2007 17:45:54 -0000	1.10
--- GrammarElement.java	18 Dec 2007 21:37:57 -0000	1.11
***************
*** 129,133 ****
  	 *
  	 * @param poSet collection of grammar elements to add to the first set
! 	 * @return <code>true</code> if the undelying first set has change
  	 * as a result of operation.
  	 */
--- 129,133 ----
  	 *
  	 * @param poSet collection of grammar elements to add to the first set
! 	 * @return <code>true</code> if the underlying first set has change
  	 * as a result of operation.
  	 */

Index: NonTerminal.java
===================================================================
RCS file: /cvsroot/marf/marf/src/marf/nlp/Parsing/GrammarCompiler/NonTerminal.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** NonTerminal.java	24 Dec 2005 04:01:11 -0000	1.10
--- NonTerminal.java	18 Dec 2007 21:37:57 -0000	1.11
***************
*** 21,25 ****
  	/**
  	 * Flag indicating whether this non-terminal is
! 	 * fefined or not.
  	 */
  	protected boolean bDefined = false;
--- 21,25 ----
  	/**
  	 * Flag indicating whether this non-terminal is
! 	 * defined or not.
  	 */
  	protected boolean bDefined = false;

Index: Grammar.java
===================================================================
RCS file: /cvsroot/marf/marf/src/marf/nlp/Parsing/GrammarCompiler/Grammar.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** Grammar.java	21 Jan 2006 02:35:32 -0000	1.21
--- Grammar.java	18 Dec 2007 21:37:56 -0000	1.22
***************
*** 89,93 ****

  	/**
! 	 * Computes first sets for all non-ternimals
  	 * from the non-terminals list.
  	 */
--- 89,93 ----

  	/**
! 	 * Computes first sets for all non-terminals
  	 * from the non-terminals list.
  	 */
***************
*** 164,168 ****

  	/**
! 	 * Computes follow sets for all non-ternimals
  	 * from the non-terminals list.
  	 *
--- 164,168 ----

  	/**
! 	 * Computes follow sets for all non-terminals
  	 * from the non-terminals list.
  	 *
***************
*** 211,215 ****
  					GrammarElement oRHSElem = (GrammarElement)oRHSList.elementAt(i);

! 					// Skip Semaantic Tokens
  					if(oRHSElem.isNonTerminal() == false && oRHSElem.isTerminal() == false)
  					{
--- 211,215 ----
  					GrammarElement oRHSElem = (GrammarElement)oRHSList.elementAt(i);

! 					// Skip Semantic Tokens
  					if(oRHSElem.isNonTerminal() == false && oRHSElem.isTerminal() == false)
  					{
***************
*** 243,247 ****

  							// Terminate upon a given RHS here doesn't have
! 							// the espsilon in it's first set
  							if(((GrammarElement)oRHSList.elementAt(j)).getFirstSet().contains(this.oEpsilonTerminal) == false)
  							{
--- 243,247 ----

  							// Terminate upon a given RHS here doesn't have
! 							// the epsilon in it's first set
  							if(((GrammarElement)oRHSList.elementAt(j)).getFirstSet().contains(this.oEpsilonTerminal) == false)
  							{
***************
*** 329,333 ****

  	/**
! 	 * Similarly to <code>contains(String)</code> lookss up
  	 * the index of the specified grammar element.
  	 * @param poGrammarElement a grammar element to look up.
--- 329,333 ----

  	/**
! 	 * Similarly to <code>contains(String)</code> looks up
  	 * the index of the specified grammar element.
  	 * @param poGrammarElement a grammar element to look up.
***************
*** 345,349 ****
  	 * @param pstrTerminal the name of the terminal
  	 * @param piNonTerminalIndex the index of the non-terminal in the table
! 	 * @return a reference tot he corresponding rule if found; null otherwise
  	 */
  	public final Rule getRule(final String pstrTerminal, final int piNonTerminalIndex)
--- 345,349 ----
  	 * @param pstrTerminal the name of the terminal
  	 * @param piNonTerminalIndex the index of the non-terminal in the table
! 	 * @return a reference to the corresponding rule if found; null otherwise
  	 */
  	public final Rule getRule(final String pstrTerminal, final int piNonTerminalIndex)
***************
*** 391,395 ****
  	 * @param piB
  	 * @param piC
! 	 * @return a reference to the rule objec given parameters; or null if not found
  	 * @throws RuntimeException if the rule found is not in CNF
  	 */
--- 391,395 ----
  	 * @param piB
  	 * @param piC
! 	 * @return a reference to the rule object given parameters; or null if not found
  	 * @throws RuntimeException if the rule found is not in CNF
  	 */
***************
*** 466,472 ****

  	/**
! 	 * Prforms serialization of this grammar data structure.
  	 * This particular implementation dumps the data in
! 	 * the textula form to screen to STDOUT.
  	 *
  	 * TODO: migrate to the MARF's dump/restore mechanisms
--- 466,472 ----

  	/**
! 	 * Performs serialization of this grammar data structure.
  	 * This particular implementation dumps the data in
! 	 * the textual form to screen to STDOUT.
  	 *
  	 * TODO: migrate to the MARF's dump/restore mechanisms

Index: GrammarAnalyzer.java
===================================================================
RCS file: /cvsroot/marf/marf/src/marf/nlp/Parsing/GrammarCompiler/GrammarAnalyzer.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** GrammarAnalyzer.java	1 Jan 2007 23:09:17 -0000	1.22
--- GrammarAnalyzer.java	18 Dec 2007 21:37:56 -0000	1.23
***************
*** 93,97 ****
  	 * parent's <code>init()</code>. Allows C++, C, and script (#)
  	 * style comments; case-sensitive; ignores EOL; and treats
! 	 * some puntuation a special. Sets default lex out filenames
  	 * for standard and error lexical output.
  	 * @see marf.nlp.Parsing.GenericLexicalAnalyzer#init()
--- 93,97 ----
  	 * parent's <code>init()</code>. Allows C++, C, and script (#)
  	 * style comments; case-sensitive; ignores EOL; and treats
! 	 * some punctuation a special. Sets default lex out filenames
  	 * for standard and error lexical output.
  	 * @see marf.nlp.Parsing.GenericLexicalAnalyzer#init()
***************
*** 107,111 ****
  			this.oStreamTokenizer.eolIsSignificant(false);

! 			// Allow C-type coments '/**/'
  			this.oStreamTokenizer.slashStarComments(true);

--- 107,111 ----
  			this.oStreamTokenizer.eolIsSignificant(false);

! 			// Allow C-type comments '/**/'
  			this.oStreamTokenizer.slashStarComments(true);

***************
*** 272,276 ****
  		if(TokenSubType.soKeywords.containsKey(this.oStreamTokenizer.sval))
  		{
! 			// Sematic Token
  			if(this.oStreamTokenizer.sval.charAt(0) == '@')
  			{
--- 272,276 ----
  		if(TokenSubType.soKeywords.containsKey(this.oStreamTokenizer.sval))
  		{
! 			// Semantic Token
  			if(this.oStreamTokenizer.sval.charAt(0) == '@')
  			{

[marf-cvs] marf/src/marf/nlp/Parsing/GrammarCompiler Grammar.java, 1.21, 1.22 GrammarAnalyzer.java,

[marf-cvs] marf/src/marf/nlp/Parsing/GrammarCompiler Grammar.java, 1.21, 1.22 GrammarAnalyzer.java, 1.22, 1.23 GrammarCompiler.java, 1.29, 1.30 GrammarElement.java, 1.10, 1.11 NonTerminal.java, 1.10, 1.11 ProbabilisticGrammarAnalyzer.java, 1.15, 1.16 ProbabilisticGrammarTokenType.java, 1.11, 1.12