[Jrman-commit] drafts/src/org/jrman/parser Parser.java,1.47,1.48

[<ma...@us...>]

Update of /cvsroot/jrman/drafts/src/org/jrman/parser
In directory sc8-pr-cvs1:/tmp/cvs-serv11999/src/org/jrman/parser

Modified Files:
	Parser.java 
Log Message:
Added plastic surface shader.
Added fog and depthcue volume shaders.
Better error handling.

Index: Parser.java
===================================================================
RCS file: /cvsroot/jrman/drafts/src/org/jrman/parser/Parser.java,v
retrieving revision 1.47
retrieving revision 1.48
diff -C2 -d -r1.47 -r1.48
*** Parser.java	22 May 2003 07:36:26 -0000	1.47
--- Parser.java	23 May 2003 06:47:02 -0000	1.48
***************
*** 153,169 ****
          int tk;
          while ((tk = st.nextToken()) != StreamTokenizer.TT_EOF) {
!             if (tk != StreamTokenizer.TT_WORD)
!                 throw new Exception("Expected keyword at line " + st.lineno());
!             String keyword = st.sval;
!             KeywordParser kp = getKeyWordParser(keyword);
!             if (!kp.getValidStates().contains(state))
!                 throw new IllegalStateException(
!                     "Keyword"
!                         + kp
!                         + " is not valid in state "
!                         + state
!                         + ", at line "
!                         + st.lineno());
!             kp.parse(st);
          }
          fis.close();
--- 153,173 ----
          int tk;
          while ((tk = st.nextToken()) != StreamTokenizer.TT_EOF) {
!             try {
!                 if (tk != StreamTokenizer.TT_WORD)
!                     throw new Exception("Expected keyword at line " + st.lineno());
!                 String keyword = st.sval;
!                 KeywordParser kp = getKeyWordParser(keyword);
!                 if (!kp.getValidStates().contains(state))
!                     throw new IllegalStateException(
!                         "Keyword"
!                             + kp
!                             + " is not valid in state "
!                             + state
!                             + ", at line "
!                             + st.lineno());
!                 kp.parse(st);
!             } catch (Exception pe) {
!                 System.err.println("Error: " + pe);
!             }
          }
          fis.close();