[cgkit-commits] cgkit2/cgkit rmshader.py,1.7,1.8

[Matthias B. <mb...@us...>]

Update of /cvsroot/cgkit/cgkit2/cgkit
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13700/cgkit

Modified Files:
	rmshader.py 
Log Message:
declare() didn't work when there was no inline declaration and the variable name started with a SL type

Index: rmshader.py
===================================================================
RCS file: /cvsroot/cgkit/cgkit2/cgkit/rmshader.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** rmshader.py	28 Jan 2006 18:33:44 -0000	1.7
--- rmshader.py	27 Apr 2006 16:57:22 -0000	1.8
***************
*** 214,222 ****
          shader.declare('Ka', type='float')
          """
! 
          # Create a "dummy shader" which will be passed to slparams to parse
          # the declaration in name
          shd = "surface spam(%s) {}"%name
          try:
              slinfo = slparams.slparams(StringIO.StringIO(shd))
              shdtype, shdname, params = slinfo[0]
--- 214,225 ----
          shader.declare('Ka', type='float')
          """
!         
          # Create a "dummy shader" which will be passed to slparams to parse
          # the declaration in name
          shd = "surface spam(%s) {}"%name
          try:
+             # Force a syntax error when name contains no declaration
+             if " " not in name:
+                 raise slparams.SyntaxError()
              slinfo = slparams.slparams(StringIO.StringIO(shd))
              shdtype, shdname, params = slinfo[0]