2006-05-25 04:32:20 +00:00
|
|
|
/* $Id: dfa.h,v 1.23 2006/05/14 13:38:26 helly Exp $ */
|
2006-02-24 04:48:15 +00:00
|
|
|
#ifndef _dfa_h
|
|
|
|
#define _dfa_h
|
|
|
|
|
|
|
|
#include <iosfwd>
|
2006-05-25 04:32:20 +00:00
|
|
|
#include <map>
|
2006-02-24 04:48:15 +00:00
|
|
|
#include "re.h"
|
|
|
|
|
2006-05-25 04:32:20 +00:00
|
|
|
namespace re2c
|
|
|
|
{
|
|
|
|
|
|
|
|
extern void prtCh(std::ostream&, uint, bool useTalx = true);
|
|
|
|
extern void prtHex(std::ostream&, uint, bool useTalx = true);
|
|
|
|
extern void prtChOrHex(std::ostream&, uint, bool useTalx = true);
|
2006-02-24 04:48:15 +00:00
|
|
|
extern void printSpan(std::ostream&, uint, uint);
|
|
|
|
|
|
|
|
class DFA;
|
2006-05-25 04:32:20 +00:00
|
|
|
|
2006-02-24 04:48:15 +00:00
|
|
|
class State;
|
|
|
|
|
2006-05-25 04:32:20 +00:00
|
|
|
class Action
|
|
|
|
{
|
|
|
|
|
2006-02-24 04:48:15 +00:00
|
|
|
public:
|
2006-05-25 04:32:20 +00:00
|
|
|
State *state;
|
|
|
|
|
2006-02-24 04:48:15 +00:00
|
|
|
public:
|
2006-05-25 04:32:20 +00:00
|
|
|
Action(State*);
|
|
|
|
virtual ~Action();
|
|
|
|
|
|
|
|
virtual void emit(std::ostream&, uint, bool&) const = 0;
|
|
|
|
virtual bool isRule() const;
|
|
|
|
virtual bool isMatch() const;
|
|
|
|
virtual bool isInitial() const;
|
|
|
|
virtual bool readAhead() const;
|
|
|
|
|
|
|
|
#ifdef PEDANTIC
|
|
|
|
protected:
|
|
|
|
Action(const Action& oth)
|
|
|
|
: state(oth.state)
|
|
|
|
{
|
|
|
|
}
|
|
|
|
Action& operator = (const Action& oth)
|
|
|
|
{
|
|
|
|
state = oth.state;
|
|
|
|
return *this;
|
|
|
|
}
|
|
|
|
#endif
|
2006-02-24 04:48:15 +00:00
|
|
|
};
|
|
|
|
|
2006-05-25 04:32:20 +00:00
|
|
|
class Match: public Action
|
|
|
|
{
|
2006-02-24 04:48:15 +00:00
|
|
|
public:
|
2006-05-25 04:32:20 +00:00
|
|
|
Match(State*);
|
|
|
|
void emit(std::ostream&, uint, bool&) const;
|
|
|
|
bool isMatch() const;
|
2006-02-24 04:48:15 +00:00
|
|
|
};
|
|
|
|
|
2006-05-25 04:32:20 +00:00
|
|
|
class Enter: public Action
|
|
|
|
{
|
2006-02-24 04:48:15 +00:00
|
|
|
public:
|
2006-05-25 04:32:20 +00:00
|
|
|
uint label;
|
|
|
|
|
2006-02-24 04:48:15 +00:00
|
|
|
public:
|
2006-05-25 04:32:20 +00:00
|
|
|
Enter(State*, uint);
|
|
|
|
void emit(std::ostream&, uint, bool&) const;
|
2006-02-24 04:48:15 +00:00
|
|
|
};
|
|
|
|
|
2006-05-25 04:32:20 +00:00
|
|
|
class Initial: public Enter
|
|
|
|
{
|
2006-02-24 04:48:15 +00:00
|
|
|
public:
|
2006-05-25 04:32:20 +00:00
|
|
|
bool setMarker;
|
|
|
|
|
2006-02-24 04:48:15 +00:00
|
|
|
public:
|
2006-05-25 04:32:20 +00:00
|
|
|
Initial(State*, uint, bool);
|
|
|
|
void emit(std::ostream&, uint, bool&) const;
|
|
|
|
bool isInitial() const;
|
2006-02-24 04:48:15 +00:00
|
|
|
};
|
|
|
|
|
2006-05-25 04:32:20 +00:00
|
|
|
class Save: public Match
|
|
|
|
{
|
|
|
|
|
|
|
|
public:
|
|
|
|
uint selector;
|
|
|
|
|
2006-02-24 04:48:15 +00:00
|
|
|
public:
|
2006-05-25 04:32:20 +00:00
|
|
|
Save(State*, uint);
|
|
|
|
void emit(std::ostream&, uint, bool&) const;
|
|
|
|
bool isMatch() const;
|
2006-02-24 04:48:15 +00:00
|
|
|
};
|
|
|
|
|
2006-05-25 04:32:20 +00:00
|
|
|
class Move: public Action
|
|
|
|
{
|
|
|
|
|
2006-02-24 04:48:15 +00:00
|
|
|
public:
|
2006-05-25 04:32:20 +00:00
|
|
|
Move(State*);
|
|
|
|
void emit(std::ostream&, uint, bool&) const;
|
|
|
|
};
|
|
|
|
|
|
|
|
class Accept: public Action
|
|
|
|
{
|
|
|
|
|
|
|
|
public:
|
|
|
|
typedef std::map<uint, State*> RuleMap;
|
|
|
|
|
|
|
|
uint nRules;
|
|
|
|
uint *saves;
|
|
|
|
State **rules;
|
|
|
|
RuleMap mapRules;
|
|
|
|
|
2006-02-24 04:48:15 +00:00
|
|
|
public:
|
2006-05-25 04:32:20 +00:00
|
|
|
Accept(State*, uint, uint*, State**);
|
|
|
|
void emit(std::ostream&, uint, bool&) const;
|
|
|
|
void emitBinary(std::ostream &o, uint ind, uint l, uint r, bool &readCh) const;
|
|
|
|
void genRuleMap();
|
|
|
|
|
|
|
|
#ifdef PEDANTIC
|
|
|
|
private:
|
|
|
|
Accept(const Accept& oth)
|
|
|
|
: Action(oth)
|
|
|
|
, nRules(oth.nRules)
|
|
|
|
, saves(oth.saves)
|
|
|
|
, rules(oth.rules)
|
|
|
|
{
|
|
|
|
}
|
|
|
|
Accept& operator=(const Accept& oth)
|
|
|
|
{
|
|
|
|
new(this) Accept(oth);
|
|
|
|
return *this;
|
|
|
|
}
|
|
|
|
#endif
|
2006-02-24 04:48:15 +00:00
|
|
|
};
|
|
|
|
|
2006-05-25 04:32:20 +00:00
|
|
|
class Rule: public Action
|
|
|
|
{
|
|
|
|
|
2006-02-24 04:48:15 +00:00
|
|
|
public:
|
2006-05-25 04:32:20 +00:00
|
|
|
RuleOp *rule;
|
|
|
|
|
2006-02-24 04:48:15 +00:00
|
|
|
public:
|
2006-05-25 04:32:20 +00:00
|
|
|
Rule(State*, RuleOp*);
|
|
|
|
void emit(std::ostream&, uint, bool&) const;
|
|
|
|
bool isRule() const;
|
|
|
|
|
|
|
|
#ifdef PEDANTIC
|
|
|
|
private:
|
|
|
|
Rule (const Rule& oth)
|
|
|
|
: Action(oth)
|
|
|
|
, rule(oth.rule)
|
|
|
|
{
|
|
|
|
}
|
|
|
|
Rule& operator=(const Rule& oth)
|
|
|
|
{
|
|
|
|
new(this) Rule(oth);
|
|
|
|
return *this;
|
|
|
|
}
|
|
|
|
#endif
|
2006-02-24 04:48:15 +00:00
|
|
|
};
|
|
|
|
|
2006-05-25 04:32:20 +00:00
|
|
|
class Span
|
|
|
|
{
|
|
|
|
|
2006-02-24 04:48:15 +00:00
|
|
|
public:
|
2006-05-25 04:32:20 +00:00
|
|
|
uint ub;
|
|
|
|
State *to;
|
|
|
|
|
2006-02-24 04:48:15 +00:00
|
|
|
public:
|
2006-05-25 04:32:20 +00:00
|
|
|
uint show(std::ostream&, uint) const;
|
2006-02-24 04:48:15 +00:00
|
|
|
};
|
|
|
|
|
2006-05-25 04:32:20 +00:00
|
|
|
class Go
|
|
|
|
{
|
2006-02-24 04:48:15 +00:00
|
|
|
public:
|
2006-05-25 04:32:20 +00:00
|
|
|
Go()
|
|
|
|
: nSpans(0)
|
|
|
|
, wSpans(~0u)
|
|
|
|
, lSpans(~0u)
|
|
|
|
, dSpans(~0u)
|
|
|
|
, lTargets(~0u)
|
|
|
|
, span(NULL)
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
2006-02-24 04:48:15 +00:00
|
|
|
public:
|
2006-05-25 04:32:20 +00:00
|
|
|
uint nSpans; // number of spans
|
|
|
|
uint wSpans; // number of spans in wide mode
|
|
|
|
uint lSpans; // number of low (non wide) spans
|
|
|
|
uint dSpans; // number of decision spans (decide between g and b mode)
|
|
|
|
uint lTargets;
|
|
|
|
Span *span;
|
|
|
|
|
|
|
|
public:
|
|
|
|
void genGoto( std::ostream&, uint ind, const State *from, const State *next, bool &readCh);
|
|
|
|
void genBase( std::ostream&, uint ind, const State *from, const State *next, bool &readCh, uint mask) const;
|
|
|
|
void genLinear(std::ostream&, uint ind, const State *from, const State *next, bool &readCh, uint mask) const;
|
|
|
|
void genBinary(std::ostream&, uint ind, const State *from, const State *next, bool &readCh, uint mask) const;
|
|
|
|
void genSwitch(std::ostream&, uint ind, const State *from, const State *next, bool &readCh, uint mask) const;
|
|
|
|
void genCpGoto(std::ostream&, uint ind, const State *from, const State *next, bool &readCh) const;
|
|
|
|
void compact();
|
|
|
|
void unmap(Go*, const State*);
|
2006-02-24 04:48:15 +00:00
|
|
|
};
|
|
|
|
|
2006-05-25 04:32:20 +00:00
|
|
|
class State
|
|
|
|
{
|
|
|
|
|
|
|
|
public:
|
|
|
|
uint label;
|
|
|
|
RuleOp *rule;
|
|
|
|
State *next;
|
|
|
|
State *link;
|
|
|
|
uint depth; // for finding SCCs
|
|
|
|
uint kCount;
|
|
|
|
Ins **kernel;
|
|
|
|
|
|
|
|
bool isPreCtxt;
|
|
|
|
bool isBase;
|
|
|
|
Go go;
|
|
|
|
Action *action;
|
|
|
|
|
|
|
|
public:
|
|
|
|
State();
|
|
|
|
~State();
|
|
|
|
void emit(std::ostream&, uint, bool&) const;
|
|
|
|
friend std::ostream& operator<<(std::ostream&, const State&);
|
|
|
|
friend std::ostream& operator<<(std::ostream&, const State*);
|
|
|
|
|
|
|
|
#ifdef PEDANTIC
|
|
|
|
private:
|
|
|
|
State(const State& oth)
|
|
|
|
: label(oth.label)
|
|
|
|
, rule(oth.rule)
|
|
|
|
, next(oth.next)
|
|
|
|
, link(oth.link)
|
|
|
|
, depth(oth.depth)
|
|
|
|
, kCount(oth.kCount)
|
|
|
|
, kernel(oth.kernel)
|
|
|
|
, isBase(oth.isBase)
|
|
|
|
, go(oth.go)
|
|
|
|
, action(oth.action)
|
|
|
|
{
|
|
|
|
}
|
|
|
|
State& operator = (const State& oth)
|
|
|
|
{
|
|
|
|
new(this) State(oth);
|
|
|
|
return *this;
|
|
|
|
}
|
|
|
|
#endif
|
2006-02-24 04:48:15 +00:00
|
|
|
};
|
|
|
|
|
2006-05-25 04:32:20 +00:00
|
|
|
class DFA
|
|
|
|
{
|
|
|
|
|
2006-02-24 04:48:15 +00:00
|
|
|
public:
|
2006-05-25 04:32:20 +00:00
|
|
|
uint lbChar;
|
|
|
|
uint ubChar;
|
|
|
|
uint nStates;
|
|
|
|
State *head, **tail;
|
|
|
|
State *toDo;
|
|
|
|
|
2006-02-24 04:48:15 +00:00
|
|
|
public:
|
2006-05-25 04:32:20 +00:00
|
|
|
DFA(Ins*, uint, uint, uint, Char*);
|
|
|
|
~DFA();
|
|
|
|
void addState(State**, State*);
|
|
|
|
State *findState(Ins**, uint);
|
|
|
|
void split(State*);
|
|
|
|
|
|
|
|
void findSCCs();
|
|
|
|
void findBaseState();
|
|
|
|
void emit(std::ostream&, uint);
|
2006-02-24 04:48:15 +00:00
|
|
|
|
2006-05-25 04:32:20 +00:00
|
|
|
friend std::ostream& operator<<(std::ostream&, const DFA&);
|
|
|
|
friend std::ostream& operator<<(std::ostream&, const DFA*);
|
2006-02-24 04:48:15 +00:00
|
|
|
|
2006-05-25 04:32:20 +00:00
|
|
|
#ifdef PEDANTIC
|
|
|
|
DFA(const DFA& oth)
|
|
|
|
: lbChar(oth.lbChar)
|
|
|
|
, ubChar(oth.ubChar)
|
|
|
|
, nStates(oth.nStates)
|
|
|
|
, head(oth.head)
|
|
|
|
, tail(oth.tail)
|
|
|
|
, toDo(oth.toDo)
|
|
|
|
{
|
|
|
|
}
|
|
|
|
DFA& operator = (const DFA& oth)
|
|
|
|
{
|
|
|
|
new(this) DFA(oth);
|
|
|
|
return *this;
|
|
|
|
}
|
|
|
|
#endif
|
2006-02-24 04:48:15 +00:00
|
|
|
};
|
|
|
|
|
2006-05-25 04:32:20 +00:00
|
|
|
inline Action::Action(State *s) : state(s)
|
|
|
|
{
|
- Updated lempar.c to v1.31.
- Added .txt files to the list of types (wad, zip, and pk3) that can be
loaded without listing them after -file.
- Fonts that are created by the ACS setfont command to wrap a texture now
support animated textures.
- FON2 fonts can now use their full palette for CR_UNTRANSLATED when drawn
with the hardware 2D path instead of being restricted to the game palette.
- Fixed: Toggling vid_vsync would reset the displayed fullscreen gamma to 1
on a Radeon 9000.
- Added back the off-by-one palette handling, but in a much more limited
scope than before. The skipped entry is assumed to always be at 248, and
it is assumed that all Shader Model 1.4 cards suffer from this. That's
because all SM1.4 cards are based on variants of the ATI R200 core, and the
RV250 in a Radeon 9000 craps up like this. I see no reason to assume that
other flavors of the R200 are any different. (Interesting note: With the
Radeon 9000, D3DTADDRESS_CLAMP is an invalid address mode when using the
debug Direct3D 9 runtime, but it works perfectly fine with the retail
Direct3D 9 runtime.) (Insight: The R200 probably uses bytes for all its
math inside pixel shaders. That would explain perfectly why I can't use
constants greater than 1 with PS1.4 and why it can't do an exact mapping to
every entry in the color palette.
- Fixed: The software shaded drawer did not work for 2D, because its selected
"color"map was replaced with the identitymap before being used.
- Fixed: I cannot use Printf to output messages before the framebuffer was
completely setup, meaning that Shader Model 1.4 cards could not change
resolution.
- I have decided to let remap palettes specify variable alpha values for
their colors. D3DFB no longer forces them to 255.
- Updated re2c to version 0.12.3.
- Fixed: A_Wander used threshold as a timer, when it should have used
reactiontime.
- Fixed: A_CustomRailgun would not fire at all for actors without a target
when the aim parameter was disabled.
- Made the warp command work in multiplayer, again courtesy of Karate Chris.
- Fixed: Trying to spawn a bot while not in a game made for a crashing time.
(Patch courtesy of Karate Chris.)
- Removed some floating point math from hu_scores.cpp that somebody's GCC
gave warnings for (not mine, though).
- Fixed: The SBarInfo drawbar command crashed if the sprite image was
unavailable.
- Fixed: FString::operator=(const char *) did not release its old buffer when
being assigned to the null string.
- The scanner no longer has an upper limit on the length of strings it
accepts, though short strings will be faster than long ones.
- Moved all the text scanning functions into a class. Mainly, this means that
multiple script scanner states can be stored without being forced to do so
recursively. I think I might be taking advantage of that in the near
future. Possibly. Maybe.
- Removed some potential buffer overflows from the decal parser.
- Applied Blzut3's SBARINFO update #9:
* Fixed: When using even length values in drawnumber it would cap to a 98
value instead of a 99 as intended.
* The SBarInfo parser can now accept negatives for coordinates. This
doesn't allow much right now, but later I plan to add better fullscreen
hud support in which the negatives will be more useful. This also cleans
up the source a bit since all calls for (x, y) coordinates are with the
function getCoordinates().
- Added support for stencilling actors.
- Added support for non-black colors specified with DTA_ColorOverlay to the
software renderer.
- Fixed: The inverse, gold, red, and green fixed colormaps each allocated
space for 32 different colormaps, even though each only used the first one.
- Added two new blending flags to make reverse subtract blending more useful:
STYLEF_InvertSource and STYLEF_InvertOverlay. These invert the color that
gets blended with the background, since that seems like a good idea for
reverse subtraction. They also work with the other two blending operations.
- Added subtract and reverse subtract blending operations to the renderer.
Since the ERenderStyle enumeration was getting rather unwieldy, I converted
it into a new FRenderStyle structure that lets each parameter of the
blending equation be set separately. This simplified the set up for the
blend quite a bit, and it means a number of new combinations are available
by setting the parameters properly.
SVN r710 (trunk)
2008-01-25 23:57:44 +00:00
|
|
|
delete s->action;
|
2006-05-25 04:32:20 +00:00
|
|
|
s->action = this;
|
|
|
|
}
|
|
|
|
|
|
|
|
inline Action::~Action()
|
|
|
|
{
|
2006-02-24 04:48:15 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
inline bool Action::isRule() const
|
2006-05-25 04:32:20 +00:00
|
|
|
{
|
|
|
|
return false;
|
|
|
|
}
|
2006-02-24 04:48:15 +00:00
|
|
|
|
|
|
|
inline bool Action::isMatch() const
|
2006-05-25 04:32:20 +00:00
|
|
|
{
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
inline bool Action::isInitial() const
|
|
|
|
{
|
|
|
|
return false;
|
|
|
|
}
|
2006-02-24 04:48:15 +00:00
|
|
|
|
|
|
|
inline bool Action::readAhead() const
|
2006-05-25 04:32:20 +00:00
|
|
|
{
|
|
|
|
return !isMatch() || (state && state->next && state->next->action && !state->next->action->isRule());
|
|
|
|
}
|
2006-02-24 04:48:15 +00:00
|
|
|
|
|
|
|
inline Match::Match(State *s) : Action(s)
|
2006-05-25 04:32:20 +00:00
|
|
|
{ }
|
2006-02-24 04:48:15 +00:00
|
|
|
|
|
|
|
inline bool Match::isMatch() const
|
2006-05-25 04:32:20 +00:00
|
|
|
{
|
|
|
|
return true;
|
|
|
|
}
|
2006-02-24 04:48:15 +00:00
|
|
|
|
|
|
|
inline Enter::Enter(State *s, uint l) : Action(s), label(l)
|
2006-05-25 04:32:20 +00:00
|
|
|
{ }
|
|
|
|
|
|
|
|
inline Initial::Initial(State *s, uint l, bool b) : Enter(s, l), setMarker(b)
|
|
|
|
{ }
|
|
|
|
|
|
|
|
inline bool Initial::isInitial() const
|
|
|
|
{
|
|
|
|
return true;
|
|
|
|
}
|
2006-02-24 04:48:15 +00:00
|
|
|
|
|
|
|
inline Save::Save(State *s, uint i) : Match(s), selector(i)
|
2006-05-25 04:32:20 +00:00
|
|
|
{ }
|
2006-02-24 04:48:15 +00:00
|
|
|
|
|
|
|
inline bool Save::isMatch() const
|
2006-05-25 04:32:20 +00:00
|
|
|
{
|
|
|
|
return false;
|
|
|
|
}
|
2006-02-24 04:48:15 +00:00
|
|
|
|
|
|
|
inline bool Rule::isRule() const
|
2006-05-25 04:32:20 +00:00
|
|
|
{
|
|
|
|
return true;
|
|
|
|
}
|
2006-02-24 04:48:15 +00:00
|
|
|
|
|
|
|
inline std::ostream& operator<<(std::ostream &o, const State *s)
|
2006-05-25 04:32:20 +00:00
|
|
|
{
|
|
|
|
return o << *s;
|
|
|
|
}
|
2006-02-24 04:48:15 +00:00
|
|
|
|
|
|
|
inline std::ostream& operator<<(std::ostream &o, const DFA *dfa)
|
2006-05-25 04:32:20 +00:00
|
|
|
{
|
|
|
|
return o << *dfa;
|
|
|
|
}
|
|
|
|
|
|
|
|
} // end namespace re2c
|
2006-02-24 04:48:15 +00:00
|
|
|
|
|
|
|
#endif
|