Skip to content

Commit 8407fa3

Browse files
authored
Merge pull request #1712 from marauder2k9-torque/ScriptBackend-Changes-and-Cleanup
Scripting language changes, cleanup and documentation
2 parents 3641727 + 991b025 commit 8407fa3

11 files changed

Lines changed: 2423 additions & 2179 deletions

File tree

Engine/source/console/console.h

Lines changed: 223 additions & 143 deletions
Large diffs are not rendered by default.

Engine/source/console/consoleInternal.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -672,13 +672,13 @@ Namespace::Entry::Entry()
672672
mPackage = StringTable->EmptyString();
673673
mToolOnly = false;
674674
VECTOR_SET_ASSOCIATION(mArgFlags);
675-
VECTOR_SET_ASSOCIATION(mDefaultValues);
675+
VECTOR_SET_ASSOCIATION(mDefaultOffsets);
676676
}
677677

678678
void Namespace::Entry::clear()
679679
{
680680
mArgFlags.clear();
681-
mDefaultValues.clear();
681+
mDefaultOffsets.clear();
682682

683683
if (mModule)
684684
{

Engine/source/console/consoleInternal.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ class Namespace
132132

133133
// Offsets to get default values for arguments.
134134
Vector<U32> mArgFlags;
135-
Vector<ConsoleValue> mDefaultValues;
135+
Vector<U32> mDefaultOffsets;
136136

137137
/// If it's a script function, this is the line of the declaration in code.
138138
/// @note 0 for functions read from legacy DSOs that have no line number information.

Engine/source/console/torquescript/CMDgram.h

Lines changed: 41 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -81,51 +81,45 @@ extern int CMDdebug;
8181
rwSWITCHSTR = 282, /* rwSWITCHSTR */
8282
rwCASEOR = 283, /* rwCASEOR */
8383
rwPACKAGE = 284, /* rwPACKAGE */
84-
rwNAMESPACE = 285, /* rwNAMESPACE */
85-
rwCLASS = 286, /* rwCLASS */
86-
rwASSERT = 287, /* rwASSERT */
87-
ILLEGAL_TOKEN = 288, /* ILLEGAL_TOKEN */
88-
CHRCONST = 289, /* CHRCONST */
89-
INTCONST = 290, /* INTCONST */
90-
TTAG = 291, /* TTAG */
91-
VAR = 292, /* VAR */
92-
IDENT = 293, /* IDENT */
93-
TYPEIDENT = 294, /* TYPEIDENT */
94-
DOCBLOCK = 295, /* DOCBLOCK */
95-
STRATOM = 296, /* STRATOM */
96-
TAGATOM = 297, /* TAGATOM */
97-
FLTCONST = 298, /* FLTCONST */
98-
opINTNAME = 299, /* opINTNAME */
99-
opINTNAMER = 300, /* opINTNAMER */
100-
opMINUSMINUS = 301, /* opMINUSMINUS */
101-
opPLUSPLUS = 302, /* opPLUSPLUS */
102-
STMT_SEP = 303, /* STMT_SEP */
103-
opSHL = 304, /* opSHL */
104-
opSHR = 305, /* opSHR */
105-
opPLASN = 306, /* opPLASN */
106-
opMIASN = 307, /* opMIASN */
107-
opMLASN = 308, /* opMLASN */
108-
opDVASN = 309, /* opDVASN */
109-
opMODASN = 310, /* opMODASN */
110-
opANDASN = 311, /* opANDASN */
111-
opXORASN = 312, /* opXORASN */
112-
opORASN = 313, /* opORASN */
113-
opSLASN = 314, /* opSLASN */
114-
opSRASN = 315, /* opSRASN */
115-
opCAT = 316, /* opCAT */
116-
opEQ = 317, /* opEQ */
117-
opNE = 318, /* opNE */
118-
opGE = 319, /* opGE */
119-
opLE = 320, /* opLE */
120-
opAND = 321, /* opAND */
121-
opOR = 322, /* opOR */
122-
opSTREQ = 323, /* opSTREQ */
123-
opCOLONCOLON = 324, /* opCOLONCOLON */
124-
opMDASN = 325, /* opMDASN */
125-
opNDASN = 326, /* opNDASN */
126-
opNTASN = 327, /* opNTASN */
127-
opSTRNE = 328, /* opSTRNE */
128-
UNARY = 329 /* UNARY */
84+
rwASSERT = 285, /* rwASSERT */
85+
ILLEGAL_TOKEN = 286, /* ILLEGAL_TOKEN */
86+
CHRCONST = 287, /* CHRCONST */
87+
INTCONST = 288, /* INTCONST */
88+
TTAG = 289, /* TTAG */
89+
VAR = 290, /* VAR */
90+
IDENT = 291, /* IDENT */
91+
TYPEIDENT = 292, /* TYPEIDENT */
92+
DOCBLOCK = 293, /* DOCBLOCK */
93+
STRATOM = 294, /* STRATOM */
94+
TAGATOM = 295, /* TAGATOM */
95+
FLTCONST = 296, /* FLTCONST */
96+
opINTNAME = 297, /* opINTNAME */
97+
opINTNAMER = 298, /* opINTNAMER */
98+
opMINUSMINUS = 299, /* opMINUSMINUS */
99+
opPLUSPLUS = 300, /* opPLUSPLUS */
100+
opSHL = 301, /* opSHL */
101+
opSHR = 302, /* opSHR */
102+
opPLASN = 303, /* opPLASN */
103+
opMIASN = 304, /* opMIASN */
104+
opMLASN = 305, /* opMLASN */
105+
opDVASN = 306, /* opDVASN */
106+
opMODASN = 307, /* opMODASN */
107+
opANDASN = 308, /* opANDASN */
108+
opXORASN = 309, /* opXORASN */
109+
opORASN = 310, /* opORASN */
110+
opSLASN = 311, /* opSLASN */
111+
opSRASN = 312, /* opSRASN */
112+
opCAT = 313, /* opCAT */
113+
opEQ = 314, /* opEQ */
114+
opNE = 315, /* opNE */
115+
opGE = 316, /* opGE */
116+
opLE = 317, /* opLE */
117+
opAND = 318, /* opAND */
118+
opOR = 319, /* opOR */
119+
opSTREQ = 320, /* opSTREQ */
120+
opSTRNE = 321, /* opSTRNE */
121+
opCOLONCOLON = 322, /* opCOLONCOLON */
122+
UNARY = 323 /* UNARY */
129123
};
130124
typedef enum yytokentype yytoken_kind_t;
131125
#endif
@@ -134,7 +128,7 @@ extern int CMDdebug;
134128
#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
135129
union YYSTYPE
136130
{
137-
#line 87 "CMDgram.y"
131+
#line 107 "CMDgram.y"
138132

139133
Token< char > c;
140134
Token< int > i;
@@ -152,7 +146,7 @@ union YYSTYPE
152146
AssignDecl asn;
153147
IfStmtNode* ifnode;
154148

155-
#line 156 "CMDgram.h"
149+
#line 150 "CMDgram.h"
156150

157151
};
158152
typedef union YYSTYPE YYSTYPE;

0 commit comments

Comments
 (0)