Changeset 387

Timestamp:

09/19/11 13:35:46 (8 months ago)

Author:

Carsten

Message:

Properly spell the name of the programming language "Lua" in strings and comments.
(See section "What's in a name?" at  http://www.lua.org/about.html for details.)

Location:

cafu/trunk/CaWE

Files:

• GuiEditor/Windows/EditorWindow.cpp (modified) (2 diffs)
• GuiEditor/Windows/EditorWindow.hpp (modified) (1 diff)
• LuaAux.cpp (modified) (1 diff)
• LuaAux.hpp (modified) (1 diff)

cafu/trunk/CaWE/GuiEditor/Windows/EditorWindow.cpp

@@ -56 +56 @@
 
     // Note: Since the name of a window comes from an already functional script or is checked when set
-    // by the method below, we assert that the name is already LUA compatible here.
+    // by the method below, we assert that the name is already Lua compatible here.
     wxASSERT(CheckLuaVarCompat(m_Win->Name));
 }
@@ -65 +65 @@
     if (!CheckLuaVarCompat(NewName))
     {
-        wxMessageBox("Window names must be LUA compatible:\n-Must only consist of letters, digits and underscores\n-Must not begin with digits\n-Must not be a LUA keyword or LUA global variable", "Error: Entity name is not LUA compatible.", wxOK | wxICON_ERROR);
+        wxMessageBox("A window name must be a string of letters, digits, and underscores that is\n"
+            "not beginning with a digit and is not a reserved Lua keyword or global variable.",
+            "Window name is not a valid Lua identifier.", wxOK | wxICON_ERROR);
         return false;
     }

cafu/trunk/CaWE/GuiEditor/Windows/EditorWindow.hpp

@@ -60 +60 @@
 
         /// Sets the name for this window.
-        /// This method checks if the name is valid in the sense of LUA compatibility
-        /// (window name is used as a LUA variable name for this window) and uniqueness.
+        /// This method checks if the name is valid in the sense of Lua compatibility
+        /// (window name is used as a Lua variable name for this window) and uniqueness.
         /// This function should always be called instead of setting the name member
         /// of the window directly.

cafu/trunk/CaWE/LuaAux.cpp

@@ -41 +41 @@
     if (LuaVarName.Matches(Varname))
     {
-        // Check if variable name is a reserved LUA keyword.
+        // Check if variable name is a reserved Lua keyword.
         for (int KeywordNr=0; KeywordNr<NrOfKeywords; KeywordNr++)
             if (Varname.c_str()==Keywords_Lua[KeywordNr]) return false;
 
-        // Check if variable name matches a LUA global variable.
+        // Check if variable name matches a Lua global variable.
         wxRegEx LuaGlobals("^[_][A-Z]+$", wxRE_ADVANCED);
         wxASSERT(LuaGlobals.IsValid());

cafu/trunk/CaWE/LuaAux.hpp

@@ -39 +39 @@
 
 
-/// Checks if a string is a valid LUA variable name.
+/// Checks if a string is a valid Lua variable name.
 /// @param Varname The variable name to be checked.
 /// @return Whether the string is valid or not.
 bool CheckLuaVarCompat(const wxString& Varname);
 
-/// Converts a string into a valid LUA variable name by replacing
+/// Converts a string into a valid Lua variable name by replacing
 /// all special invalid characters with underscores and/or adding
 /// underscores to the begining of the name to make it valid.
 /// @param Varname The variable name to convert.
-/// @return The converted valid LUA variable name.
+/// @return The converted valid Lua variable name.
 wxString MakeLuaVarName(const wxString& Varname);