diff --git a/docs/rh-log.txt b/docs/rh-log.txt index abed45b458..9b557628c8 100644 --- a/docs/rh-log.txt +++ b/docs/rh-log.txt @@ -1,3 +1,7 @@ +November 29, 2006 (Changes by Graf Zahl) +- Made the constructor of PSymbolTable inline. Having this a real function + adds 100kb to the EXE, mostly needless exception handling code. + November 28, 2006 (Changes by Graf Zahl) - Fixed: The StrifePlayer couldn't obtain his default inventory because APlayerPawn::GiveDefaultInventory gave him some HexenArmor even though diff --git a/src/dobjtype.cpp b/src/dobjtype.cpp index b00a388978..b9b7d579ca 100644 --- a/src/dobjtype.cpp +++ b/src/dobjtype.cpp @@ -305,11 +305,6 @@ void PClass::FreeStateList () // Symbol tables ------------------------------------------------------------ -PSymbolTable::PSymbolTable () -: ParentSymbolTable(NULL) -{ -} - PSymbolTable::~PSymbolTable () { for (unsigned int i = 0; i < Symbols.Size(); ++i) @@ -385,4 +380,4 @@ PSymbol *PSymbolTable::AddSymbol (PSymbol *sym) // Good. The symbol is not in the table yet. Symbols.Insert (MAX(min, max), sym); return sym; -} +} \ No newline at end of file diff --git a/src/dobjtype.h b/src/dobjtype.h index 65efafc1b9..773ccacb87 100644 --- a/src/dobjtype.h +++ b/src/dobjtype.h @@ -56,7 +56,10 @@ struct PSymbolActionFunction : public PSymbol class PSymbolTable { public: - PSymbolTable(); + PSymbolTable() : ParentSymbolTable(NULL) + { + } + ~PSymbolTable(); // Sets the table to use for searches if this one doesn't contain the diff --git a/src/sc_man_scanner.re b/src/sc_man_scanner.re index 8f2df52051..89819a92b8 100644 --- a/src/sc_man_scanner.re +++ b/src/sc_man_scanner.re @@ -178,29 +178,29 @@ std2: "==" { RET(TK_Eq); } "!=" { RET(TK_Neq); } ";" { RET(';'); } - "{" { RET('{'); } - "}" { RET('}'); } - "," { RET(','); } - ":" { RET(':'); } - "=" { RET('='); } - "(" { RET('('); } - ")" { RET(')'); } - "[" { RET('['); } - "]" { RET(']'); } - "." { RET('.'); } - "&" { RET('&'); } - "!" { RET('!'); } - "~" { RET('~'); } - "-" { RET('-'); } - "+" { RET('+'); } - "*" { RET('*'); } - "/" { RET('/'); } - "%" { RET('%'); } - "<" { RET('<'); } - ">" { RET('>'); } - "^" { RET('^'); } - "|" { RET('|'); } - "?" { RET('?'); } + "{" { RET('{'); } + "}" { RET('}'); } + "," { RET(','); } + ":" { RET(':'); } + "=" { RET('='); } + "(" { RET('('); } + ")" { RET(')'); } + "[" { RET('['); } + "]" { RET(']'); } + "." { RET('.'); } + "&" { RET('&'); } + "!" { RET('!'); } + "~" { RET('~'); } + "-" { RET('-'); } + "+" { RET('+'); } + "*" { RET('*'); } + "/" { RET('/'); } + "%" { RET('%'); } + "<" { RET('<'); } + ">" { RET('>'); } + "^" { RET('^'); } + "|" { RET('|'); } + "?" { RET('?'); } [ \t\v\f\r]+ { goto std1; } "\n" { goto newline; }