REVISION 3.

Remove illegal operators for overloading.

diff --git a/src/mesa/shader/slang/library/slang_shader.syn b/src/mesa/shader/slang/library/slang_shader.syn
index 65d7fe353224134b848cd82cf3cd5dbb9facd217..aeb3c6112c2a7bd0e77c7a20817e34921e1c7988 100644 (file)
--- a/src/mesa/shader/slang/library/slang_shader.syn
+++ b/src/mesa/shader/slang/library/slang_shader.syn
@@ -1,8 +1,8 @@
 /*\r
  * Mesa 3-D graphics library\r
- * Version:  6.2\r
+ * Version:  6.5\r
  *\r
- * Copyright (C) 2004-2005  Brian Paul   All Rights Reserved.\r
+ * Copyright (C) 2004-2006  Brian Paul   All Rights Reserved.\r
  *\r
  * Permission is hereby granted, free of charge, to any person obtaining a\r
  * copy of this software and associated documentation files (the "Software"),\r
@@ -49,7 +49,7 @@
 .syntax translation_unit;\r
 \r
 /* revision number - increment after each change affecting emitted output */\r
-.emtcode REVISION                                   2\r
+.emtcode REVISION                                   3\r
 \r
 /* external declaration */\r
 .emtcode EXTERNAL_NULL                              0\r
@@ -66,38 +66,35 @@
 .emtcode FUNCTION_OPERATOR                          2\r
 \r
 /* operator type */\r
-.emtcode OPERATOR_ASSIGN                            1\r
-.emtcode OPERATOR_ADDASSIGN                         2\r
-.emtcode OPERATOR_SUBASSIGN                         3\r
-.emtcode OPERATOR_MULASSIGN                         4\r
-.emtcode OPERATOR_DIVASSIGN                         5\r
-/*.emtcode OPERATOR_MODASSIGN                         6*/\r
-/*.emtcode OPERATOR_LSHASSIGN                         7*/\r
-/*.emtcode OPERATOR_RSHASSIGN                         8*/\r
-/*.emtcode OPERATOR_ORASSIGN                          9*/\r
-/*.emtcode OPERATOR_XORASSIGN                         10*/\r
-/*.emtcode OPERATOR_ANDASSIGN                         11*/\r
-.emtcode OPERATOR_LOGICALXOR                        12\r
-/*.emtcode OPERATOR_BITOR                             13*/\r
-/*.emtcode OPERATOR_BITXOR                            14*/\r
-/*.emtcode OPERATOR_BITAND                            15*/\r
-.emtcode OPERATOR_EQUAL                             16\r
-.emtcode OPERATOR_NOTEQUAL                          17\r
-.emtcode OPERATOR_LESS                              18\r
-.emtcode OPERATOR_GREATER                           19\r
-.emtcode OPERATOR_LESSEQUAL                         20\r
-.emtcode OPERATOR_GREATEREQUAL                      21\r
-/*.emtcode OPERATOR_LSHIFT                            22*/\r
-/*.emtcode OPERATOR_RSHIFT                            23*/\r
-.emtcode OPERATOR_MULTIPLY                          24\r
-.emtcode OPERATOR_DIVIDE                            25\r
-/*.emtcode OPERATOR_MODULUS                           26*/\r
-.emtcode OPERATOR_INCREMENT                         27\r
-.emtcode OPERATOR_DECREMENT                         28\r
-.emtcode OPERATOR_PLUS                              29\r
-.emtcode OPERATOR_MINUS                             30\r
-/*.emtcode OPERATOR_COMPLEMENT                        31*/\r
-.emtcode OPERATOR_NOT                               32\r
+.emtcode OPERATOR_ADDASSIGN                         1\r
+.emtcode OPERATOR_SUBASSIGN                         2\r
+.emtcode OPERATOR_MULASSIGN                         3\r
+.emtcode OPERATOR_DIVASSIGN                         4\r
+/*.emtcode OPERATOR_MODASSIGN                         5*/\r
+/*.emtcode OPERATOR_LSHASSIGN                         6*/\r
+/*.emtcode OPERATOR_RSHASSIGN                         7*/\r
+/*.emtcode OPERATOR_ORASSIGN                          8*/\r
+/*.emtcode OPERATOR_XORASSIGN                         9*/\r
+/*.emtcode OPERATOR_ANDASSIGN                         10*/\r
+.emtcode OPERATOR_LOGICALXOR                        11\r
+/*.emtcode OPERATOR_BITOR                             12*/\r
+/*.emtcode OPERATOR_BITXOR                            13*/\r
+/*.emtcode OPERATOR_BITAND                            14*/\r
+.emtcode OPERATOR_LESS                              15\r
+.emtcode OPERATOR_GREATER                           16\r
+.emtcode OPERATOR_LESSEQUAL                         17\r
+.emtcode OPERATOR_GREATEREQUAL                      18\r
+/*.emtcode OPERATOR_LSHIFT                            19*/\r
+/*.emtcode OPERATOR_RSHIFT                            20*/\r
+.emtcode OPERATOR_MULTIPLY                          21\r
+.emtcode OPERATOR_DIVIDE                            22\r
+/*.emtcode OPERATOR_MODULUS                           23*/\r
+.emtcode OPERATOR_INCREMENT                         24\r
+.emtcode OPERATOR_DECREMENT                         25\r
+.emtcode OPERATOR_PLUS                              26\r
+.emtcode OPERATOR_MINUS                             27\r
+/*.emtcode OPERATOR_COMPLEMENT                        28*/\r
+.emtcode OPERATOR_NOT                               29\r
 \r
 /* init declarator list */\r
 .emtcode DECLARATOR_NONE                            0\r
@@ -684,7 +681,6 @@ overriden_operator
     minusminus .emit OPERATOR_DECREMENT .or\r
     minusequals .emit OPERATOR_SUBASSIGN .or\r
     minus .emit OPERATOR_MINUS .or\r
-    bangequals .emit OPERATOR_NOTEQUAL .or\r
     bang .emit OPERATOR_NOT .or\r
     starequals .emit OPERATOR_MULASSIGN .or\r
     star .emit OPERATOR_MULTIPLY .or\r
@@ -698,8 +694,6 @@ overriden_operator
     /*greatergreaterequals .emit OPERATOR_RSHASSIGN .or*/\r
     /*greatergreater .emit OPERATOR_RSHIFT .or*/\r
     greater .emit OPERATOR_GREATER .or\r
-    equalsequals .emit OPERATOR_EQUAL .or\r
-    equals .emit OPERATOR_ASSIGN .or\r
     /*percentequals .emit OPERATOR_MODASSIGN .or*/\r
     /*percent .emit OPERATOR_MODULUS .or*/\r
     /*ampersandequals .emit OPERATOR_ANDASSIGN */\r

diff --git a/src/mesa/shader/slang/library/slang_shader_syn.h b/src/mesa/shader/slang/library/slang_shader_syn.h
index 4645e1419ea666c36a6d949cd84b54759086b65b..6100400fef0f776f9fedb4de36b2e84a368dbd78 100644 (file)
--- a/src/mesa/shader/slang/library/slang_shader_syn.h
+++ b/src/mesa/shader/slang/library/slang_shader_syn.h
@@ -1,5 +1,5 @@
 ".syntax translation_unit;\n"\r
-".emtcode REVISION 2\n"\r
+".emtcode REVISION 3\n"\r
 ".emtcode EXTERNAL_NULL 0\n"\r
 ".emtcode EXTERNAL_FUNCTION_DEFINITION 1\n"\r
 ".emtcode EXTERNAL_DECLARATION 2\n"\r
@@ -8,25 +8,22 @@
 ".emtcode FUNCTION_ORDINARY 0\n"\r
 ".emtcode FUNCTION_CONSTRUCTOR 1\n"\r
 ".emtcode FUNCTION_OPERATOR 2\n"\r
-".emtcode OPERATOR_ASSIGN 1\n"\r
-".emtcode OPERATOR_ADDASSIGN 2\n"\r
-".emtcode OPERATOR_SUBASSIGN 3\n"\r
-".emtcode OPERATOR_MULASSIGN 4\n"\r
-".emtcode OPERATOR_DIVASSIGN 5\n"\r
-".emtcode OPERATOR_LOGICALXOR 12\n"\r
-".emtcode OPERATOR_EQUAL 16\n"\r
-".emtcode OPERATOR_NOTEQUAL 17\n"\r
-".emtcode OPERATOR_LESS 18\n"\r
-".emtcode OPERATOR_GREATER 19\n"\r
-".emtcode OPERATOR_LESSEQUAL 20\n"\r
-".emtcode OPERATOR_GREATEREQUAL 21\n"\r
-".emtcode OPERATOR_MULTIPLY 24\n"\r
-".emtcode OPERATOR_DIVIDE 25\n"\r
-".emtcode OPERATOR_INCREMENT 27\n"\r
-".emtcode OPERATOR_DECREMENT 28\n"\r
-".emtcode OPERATOR_PLUS 29\n"\r
-".emtcode OPERATOR_MINUS 30\n"\r
-".emtcode OPERATOR_NOT 32\n"\r
+".emtcode OPERATOR_ADDASSIGN 1\n"\r
+".emtcode OPERATOR_SUBASSIGN 2\n"\r
+".emtcode OPERATOR_MULASSIGN 3\n"\r
+".emtcode OPERATOR_DIVASSIGN 4\n"\r
+".emtcode OPERATOR_LOGICALXOR 11\n"\r
+".emtcode OPERATOR_LESS 15\n"\r
+".emtcode OPERATOR_GREATER 16\n"\r
+".emtcode OPERATOR_LESSEQUAL 17\n"\r
+".emtcode OPERATOR_GREATEREQUAL 18\n"\r
+".emtcode OPERATOR_MULTIPLY 21\n"\r
+".emtcode OPERATOR_DIVIDE 22\n"\r
+".emtcode OPERATOR_INCREMENT 24\n"\r
+".emtcode OPERATOR_DECREMENT 25\n"\r
+".emtcode OPERATOR_PLUS 26\n"\r
+".emtcode OPERATOR_MINUS 27\n"\r
+".emtcode OPERATOR_NOT 29\n"\r
 ".emtcode DECLARATOR_NONE 0\n"\r
 ".emtcode DECLARATOR_NEXT 1\n"\r
 ".emtcode VARIABLE_NONE 0\n"\r
@@ -298,7 +295,6 @@
 " minusminus .emit OPERATOR_DECREMENT .or\n"\r
 " minusequals .emit OPERATOR_SUBASSIGN .or\n"\r
 " minus .emit OPERATOR_MINUS .or\n"\r
-" bangequals .emit OPERATOR_NOTEQUAL .or\n"\r
 " bang .emit OPERATOR_NOT .or\n"\r
 " starequals .emit OPERATOR_MULASSIGN .or\n"\r
 " star .emit OPERATOR_MULTIPLY .or\n"\r
@@ -312,8 +308,6 @@
 " \n"\r
 " \n"\r
 " greater .emit OPERATOR_GREATER .or\n"\r
-" equalsequals .emit OPERATOR_EQUAL .or\n"\r
-" equals .emit OPERATOR_ASSIGN .or\n"\r
 " \n"\r
 " \n"\r
 " \n"\r
@@ -755,4 +749,4 @@
 " '\\'' .or '<' .or ',' .or '>' .or '.' .or '/' .or '?' .or err_identifier;\n"\r
 "err_identifier\n"\r
 " id_character_first .and .loop id_character_next;\n"\r
-""\r
+""
\ No newline at end of file