diff --git a/twander.py b/twander.py index 3de97b2..95f9126 100755 --- a/twander.py +++ b/twander.py @@ -6,7 +6,7 @@ # Program Information PROGNAME = "twander" -RCSID = "$Id: twander.py,v 3.115 2003/02/28 23:45:55 tundra Exp $" +RCSID = "$Id: twander.py,v 3.116 2003/03/01 00:04:05 tundra Exp $" VERSION = RCSID.split()[2] # Copyright Information @@ -521,9 +521,9 @@ # Names Of Conditional And Pre-Defined Symbols -CONDENDIF = '.ENDIF' +CONDENDIF = '.endif' CONDEQUAL = '==' -CONDIF = '.IF' +CONDIF = '.if' SYMOS = '.OS' SYMPLATFORM = '.PLATFORM' @@ -654,7 +654,7 @@ wLINKBACK = "%s Points Back To Own Directory" wNOCMDS = "Running With No Commands Defined!" wNOREBIND = "Ignoring Line %s.\nCannot Rebind This Keyboard Or Mouse Button Combination:\n\n%s" -wREDEFVAR = "Ignoring Line %s.\nVariable %s Redefined:\n\n%s" +wREDEFVAR = "Ignoring Line %s.\nCannot Redefine Variable %s:\n\n%s" wUNDEFVBL = "Ignoring Line %s.\nUndefined Variable %s Referenced:\n\n%s" wVBLTOODEEP = "Ignoring Line %s.\nVariable Definition Nested Too Deeply:\n\n%s" wWARN = "WARNING" @@ -1109,8 +1109,6 @@ else: ConditionalStack.pop() - print ConditionalStack - ### # Variable Definitions And Special Assignments ### @@ -1158,10 +1156,7 @@ # Error out on variable redefinitions of either # existing user-defined variables or built-ins - if UI.SymTable.has_key(name) or \ - UI.BuiltIns.has_key('[' + name + ']') or \ - UI.BuiltIns.has_key('[' + name): - + if UI.BuiltIns.has_key('[' + name + ']') or UI.BuiltIns.has_key('[' + name): WrnMsg(wREDEFVAR % (num, name, line)) return