izackp/mosh
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace Action with Action* so can be polymorphic

Browse Source
This commit is contained in:
Keith Winstein
2011-01-13 00:44:07 -05:00
parent 82ac626320
commit 59f000cdce
7 changed files with 123 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files
parserstate.cpp
+87 -84
View File
@@ -9,22 +9,22 @@ Transition State::anywhere_rule( wchar_t ch )
|| ((0x80 <= ch) && (ch <= 0x8F))
|| ((0x91 <= ch) && (ch <= 0x97))
|| (ch == 0x99) || (ch == 0x9A) ) {
return Transition( Execute(), &family->s_Ground );
return Transition( new Execute(), &family->s_Ground );
} else if ( ch == 0x9C ) {
return Transition( Ignore(), &family->s_Ground );
return Transition( NULL, &family->s_Ground );
} else if ( ch == 0x1B ) {
return Transition( Ignore(), &family->s_Escape );
return Transition( NULL, &family->s_Escape );
} else if ( (ch == 0x98) || (ch == 0x9E) || (ch == 0x9F) ) {
return Transition( Ignore(), &family->s_SOS_PM_APC_String );
return Transition( NULL, &family->s_SOS_PM_APC_String );
} else if ( ch == 0x90 ) {
return Transition( Ignore(), &family->s_DCS_Entry );
return Transition( NULL, &family->s_DCS_Entry );
} else if ( ch == 0x9D ) {
return Transition( Ignore(), &family->s_OSC_String );
return Transition( NULL, &family->s_OSC_String );
} else if ( ch == 0x9B ) {
return Transition( Ignore(), &family->s_CSI_Entry );
return Transition( NULL, &family->s_CSI_Entry );
}
return Transition( Ignore(), NULL );
return Transition();
}
Transition State::input( wchar_t ch )
@@ -38,8 +38,11 @@ Transition State::input( wchar_t ch )
}
}
ret.action.char_present = true;
ret.action.ch = ch;
if ( ret.action ) {
ret.action->char_present = true;
ret.action->ch = ch;
}
return ret;
}
@@ -59,29 +62,29 @@ static bool GLGR ( wchar_t ch )
Transition Ground::input_state_rule( wchar_t ch )
{
if ( C0_prime( ch ) ) {
return Transition( Execute(), NULL );
return Transition( new Execute() );
}
if ( GLGR( ch ) ) {
return Transition( Print(), NULL );
return Transition( new Print() );
}
return Transition( Ignore(), NULL );
return Transition();
}
Action Escape::enter( void )
Action *Escape::enter( void )
{
return Clear();
return new Clear();
}
Transition Escape::input_state_rule( wchar_t ch )
{
if ( C0_prime( ch ) ) {
return Transition( Execute(), NULL );
return Transition( new Execute() );
}
if ( (0x20 <= ch) && (ch <= 0x2F) ) {
return Transition( Collect(), &family->s_Escape_Intermediate );
return Transition( new Collect(), &family->s_Escape_Intermediate );
}
if ( ( (0x30 <= ch) && (ch <= 0x4F) )
@@ -90,263 +93,263 @@ Transition Escape::input_state_rule( wchar_t ch )
|| ( ch == 0x5A )
|| ( ch == 0x5C )
|| ( (0x60 <= ch) && (ch <= 0x7E) ) ) {
return Transition( Esc_Dispatch(), &family->s_Ground );
return Transition( new Esc_Dispatch(), &family->s_Ground );
}
if ( ch == 0x5B ) {
return Transition( Ignore(), &family->s_CSI_Entry );
return Transition( NULL, &family->s_CSI_Entry );
}
if ( ch == 0x5D ) {
return Transition( Ignore(), &family->s_OSC_String );
return Transition( NULL, &family->s_OSC_String );
}
if ( ch == 0x50 ) {
return Transition( Ignore(), &family->s_DCS_Entry );
return Transition( NULL, &family->s_DCS_Entry );
}
if ( (ch == 0x58) || (ch == 0x5E) || (ch == 0x5F) ) {
return Transition( Ignore(), &family->s_SOS_PM_APC_String );
return Transition( NULL, &family->s_SOS_PM_APC_String );
}
return Transition( Ignore(), NULL );
return Transition();
}
Transition Escape_Intermediate::input_state_rule( wchar_t ch )
{
if ( C0_prime( ch ) ) {
return Transition( Execute(), NULL );
return Transition( new Execute() );
}
if ( (0x20 <= ch) && (ch <= 0x2F) ) {
return Transition( Collect(), NULL );
return Transition( new Collect() );
}
if ( (0x30 <= ch) && (ch <= 0x7E) ) {
return Transition( Esc_Dispatch(), &family->s_Ground );
return Transition( new Esc_Dispatch(), &family->s_Ground );
}
return Transition( Ignore(), NULL );
return Transition();
}
Action CSI_Entry::enter( void )
Action *CSI_Entry::enter( void )
{
return Clear();
return new Clear();
}
Transition CSI_Entry::input_state_rule( wchar_t ch )
{
if ( C0_prime( ch ) ) {
return Transition( Execute(), NULL );
return Transition( new Execute() );
}
if ( (0x40 <= ch) && (ch <= 0x7E) ) {
return Transition( CSI_Dispatch(), &family->s_Ground );
return Transition( new CSI_Dispatch(), &family->s_Ground );
}
if ( ( (0x30 <= ch) && (ch <= 0x39) )
|| ( ch == 0x3B ) ) {
return Transition( Param(), &family->s_CSI_Param );
return Transition( new Param(), &family->s_CSI_Param );
}
if ( (ch <= 0x3C) && (ch <= 0x3F) ) {
return Transition( Collect(), &family->s_CSI_Param );
return Transition( new Collect(), &family->s_CSI_Param );
}
if ( ch == 0x3A ) {
return Transition( Ignore(), &family->s_CSI_Ignore );
return Transition( NULL, &family->s_CSI_Ignore );
}
if ( (0x20 <= ch) && (ch <= 0x2F) ) {
return Transition( Collect(), &family->s_CSI_Intermediate );
return Transition( new Collect(), &family->s_CSI_Intermediate );
}
return Transition( Ignore(), NULL );
return Transition();
}
Transition CSI_Param::input_state_rule( wchar_t ch )
{
if ( ( (0x30 <= ch) && (ch <= 0x39) ) || ( ch == 0x3B ) ) {
return Transition( Param(), NULL );
return Transition( new Param() );
}
if ( ( ch == 0x3A ) || ( (0x3C <= ch) && (ch <= 0x3F) ) ) {
return Transition( Ignore(), &family->s_CSI_Ignore );
return Transition( NULL, &family->s_CSI_Ignore );
}
if ( (0x20 <= ch) && (ch <= 0x2F) ) {
return Transition( Collect(), &family->s_CSI_Intermediate );
return Transition( new Collect(), &family->s_CSI_Intermediate );
}
if ( (0x40 <= ch) && (ch <= 0x7E) ) {
return Transition( CSI_Dispatch(), &family->s_Ground );
return Transition( new CSI_Dispatch(), &family->s_Ground );
}
return Transition( Ignore(), NULL );
return Transition();
}
Transition CSI_Intermediate::input_state_rule( wchar_t ch )
{
if ( C0_prime( ch ) ) {
return Transition( Execute(), NULL );
return Transition( new Execute() );
}
if ( (0x20 <= ch) && (ch <= 0x2F) ) {
return Transition( Collect(), NULL );
return Transition( new Collect() );
}
if ( (0x40 <= ch) && (ch <= 0x7E) ) {
return Transition( CSI_Dispatch(), &family->s_Ground );
return Transition( new CSI_Dispatch(), &family->s_Ground );
}
if ( (0x30 <= ch) && (ch <= 0x3F) ) {
return Transition( Ignore(), &family->s_CSI_Ignore );
return Transition( NULL, &family->s_CSI_Ignore );
}
return Transition( Ignore(), NULL );
return Transition();
}
Transition CSI_Ignore::input_state_rule( wchar_t ch )
{
if ( C0_prime( ch ) ) {
return Transition( Execute(), NULL );
return Transition( new Execute() );
}
if ( (0x40 <= ch) && (ch <= 0x7E) ) {
return Transition( Ignore(), &family->s_Ground );
return Transition( NULL, &family->s_Ground );
}
return Transition( Ignore(), NULL );
return Transition();
}
Action DCS_Entry::enter( void )
Action *DCS_Entry::enter( void )
{
return Clear();
return new Clear();
}
Transition DCS_Entry::input_state_rule( wchar_t ch )
{
if ( (0x20 <= ch) && (ch <= 0x2F) ) {
return Transition( Collect(), &family->s_DCS_Intermediate );
return Transition( new Collect(), &family->s_DCS_Intermediate );
}
if ( ch == 0x3A ) {
return Transition( Ignore(), &family->s_DCS_Ignore );
return Transition( NULL, &family->s_DCS_Ignore );
}
if ( ( (0x30 <= ch) && (ch <= 0x39) ) || ( ch == 0x3B ) ) {
return Transition( Param(), &family->s_DCS_Param );
return Transition( new Param(), &family->s_DCS_Param );
}
if ( (0x3C <= ch) && (ch <= 0x3F) ) {
return Transition( Collect(), &family->s_DCS_Param );
return Transition( new Collect(), &family->s_DCS_Param );
}
if ( (0x40 <= ch) && (ch <= 0x7E) ) {
return Transition( Ignore(), &family->s_DCS_Passthrough );
return Transition( NULL, &family->s_DCS_Passthrough );
}
return Transition( Ignore(), NULL );
return Transition();
}
Transition DCS_Param::input_state_rule( wchar_t ch )
{
if ( ( (0x30 <= ch) && (ch <= 0x39) ) || ( ch == 0x3B ) ) {
return Transition( Param(), NULL );
return Transition( new Param() );
}
if ( ( ch == 0x3A ) || ( (0x3C <= ch) && (ch <= 0x3F) ) ) {
return Transition( Ignore(), &family->s_DCS_Ignore );
return Transition( NULL, &family->s_DCS_Ignore );
}
if ( (0x20 <= ch) && (ch <= 0x2F) ) {
return Transition( Collect(), &family->s_DCS_Intermediate );
return Transition( new Collect(), &family->s_DCS_Intermediate );
}
if ( (0x40 <= ch) && (ch <= 0x7E) ) {
return Transition( Ignore(), &family->s_DCS_Passthrough );
return Transition( NULL, &family->s_DCS_Passthrough );
}
return Transition( Ignore(), NULL );
return Transition();
}
Transition DCS_Intermediate::input_state_rule( wchar_t ch )
{
if ( (0x20 <= ch) && (ch <= 0x2F) ) {
return Transition( Collect(), NULL );
return Transition( new Collect() );
}
if ( (0x40 <= ch) && (ch <= 0x7E) ) {
return Transition( Ignore(), &family->s_DCS_Passthrough );
return Transition( NULL, &family->s_DCS_Passthrough );
}
if ( (0x30 <= ch) && (ch <= 0x3F) ) {
return Transition( Ignore(), &family->s_DCS_Ignore );
return Transition( NULL, &family->s_DCS_Ignore );
}
return Transition( Ignore(), NULL );
return Transition();
}
Action DCS_Passthrough::enter( void )
Action *DCS_Passthrough::enter( void )
{
return Hook();
return new Hook();
}
Action DCS_Passthrough::exit( void )
Action *DCS_Passthrough::exit( void )
{
return Unhook();
return new Unhook();
}
Transition DCS_Passthrough::input_state_rule( wchar_t ch )
{
if ( C0_prime( ch ) || ( (0x20 <= ch) && (ch <= 0x7E) ) ) {
return Transition( Put(), NULL );
return Transition( new Put() );
}
if ( ch == 0x9C ) {
return Transition( Ignore(), &family->s_Ground );
return Transition( NULL, &family->s_Ground );
}
return Transition( Ignore(), NULL );
return Transition();
}
Transition DCS_Ignore::input_state_rule( wchar_t ch )
{
if ( ch == 0x9C ) {
return Transition( Ignore(), &family->s_Ground );
return Transition( NULL, &family->s_Ground );
}
return Transition( Ignore(), NULL );
return Transition();
}
Action OSC_String::enter( void )
Action *OSC_String::enter( void )
{
return OSC_Start();
return new OSC_Start();
}
Action OSC_String::exit( void )
Action *OSC_String::exit( void )
{
return OSC_End();
return new OSC_End();
}
Transition OSC_String::input_state_rule( wchar_t ch )
{
if ( (0x20 <= ch) && (ch <= 0x7F) ) {
return Transition( OSC_Put(), NULL );
return Transition( new OSC_Put() );
}
if ( (ch == 0x9C) || (ch == 0x07) ) { /* 0x07 is xterm non-ANSI variant */
return Transition( Ignore(), &family->s_Ground );
return Transition( NULL, &family->s_Ground );
}
return Transition( Ignore(), NULL );
return Transition();
}
Transition SOS_PM_APC_String::input_state_rule( wchar_t ch )
{
if ( ch == 0x9C ) {
return Transition( Ignore(), &family->s_Ground );
return Transition( NULL, &family->s_Ground );
}
return Transition( Ignore(), NULL );
return Transition();
}