summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichal Krol <[email protected]>2009-09-08 10:33:49 +0200
committerMichal Krol <[email protected]>2009-09-08 10:33:49 +0200
commit7e6e5cd60a4ce2f63cd2563307d79fc0ed7218cd (patch)
tree44c55b542875c6824096d621a4fcf734d103aba4
parent0aeff7638b4ae14a9142ff05390cbc89a058d57e (diff)
slang: Remove dependencies on error tokens.
-rw-r--r--src/mesa/shader/slang/library/slang_shader.syn10
-rw-r--r--src/mesa/shader/slang/library/slang_shader_syn.h10
2 files changed, 10 insertions, 10 deletions
diff --git a/src/mesa/shader/slang/library/slang_shader.syn b/src/mesa/shader/slang/library/slang_shader.syn
index cfd7b17b35d..f35356bf4a0 100644
--- a/src/mesa/shader/slang/library/slang_shader.syn
+++ b/src/mesa/shader/slang/library/slang_shader.syn
@@ -274,11 +274,11 @@
/* any syntax errors... */
.errtext INVALID_EXTERNAL_DECLARATION "2001: Syntax error."
.errtext INVALID_OPERATOR_OVERRIDE "2002: Invalid operator override."
-.errtext LBRACE_EXPECTED "2003: '{' expected but '$err_token$' found."
-.errtext LPAREN_EXPECTED "2004: '(' expected but '$err_token$' found."
-.errtext RPAREN_EXPECTED "2005: ')' expected but '$err_token$' found."
-.errtext INVALID_PRECISION "2006: Invalid precision specifier '$err_token$'."
-.errtext INVALID_PRECISION_TYPE "2007: Invalid precision type '$err_token$'."
+.errtext LBRACE_EXPECTED "2003: '{' expected but token found."
+.errtext LPAREN_EXPECTED "2004: '(' expected but token found."
+.errtext RPAREN_EXPECTED "2005: ')' expected but token found."
+.errtext INVALID_PRECISION "2006: Invalid precision specifier."
+.errtext INVALID_PRECISION_TYPE "2007: Invalid precision type."
/*
diff --git a/src/mesa/shader/slang/library/slang_shader_syn.h b/src/mesa/shader/slang/library/slang_shader_syn.h
index d7ee0765613..ca62d41b7f4 100644
--- a/src/mesa/shader/slang/library/slang_shader_syn.h
+++ b/src/mesa/shader/slang/library/slang_shader_syn.h
@@ -150,11 +150,11 @@
".emtcode PARAMETER_ARRAY_PRESENT 1\n"
".errtext INVALID_EXTERNAL_DECLARATION \"2001: Syntax error.\"\n"
".errtext INVALID_OPERATOR_OVERRIDE \"2002: Invalid operator override.\"\n"
-".errtext LBRACE_EXPECTED \"2003: '{' expected but '$err_token$' found.\"\n"
-".errtext LPAREN_EXPECTED \"2004: '(' expected but '$err_token$' found.\"\n"
-".errtext RPAREN_EXPECTED \"2005: ')' expected but '$err_token$' found.\"\n"
-".errtext INVALID_PRECISION \"2006: Invalid precision specifier '$err_token$'.\"\n"
-".errtext INVALID_PRECISION_TYPE \"2007: Invalid precision type '$err_token$'.\"\n"
+".errtext LBRACE_EXPECTED \"2003: '{' expected but token found.\"\n"
+".errtext LPAREN_EXPECTED \"2004: '(' expected but token found.\"\n"
+".errtext RPAREN_EXPECTED \"2005: ')' expected but token found.\"\n"
+".errtext INVALID_PRECISION \"2006: Invalid precision specifier.\"\n"
+".errtext INVALID_PRECISION_TYPE \"2007: Invalid precision type.\"\n"
".regbyte parsing_builtin 0\n"
".regbyte shader_type 0\n"
"variable_identifier\n"