Rewrote the ansi parser to exactly callback on color setting, so now just need to clean this all up and fix a few little bugs.
This commit is contained in:
Zed A. Shaw
parent
96ee16e598
commit
89a70f398a
9 changed files with 274 additions and 126 deletions
185
ansi_parser.cpp
185
ansi_parser.cpp
|
|
@ -5,86 +5,98 @@
|
|||
#include "dbc.hpp"
|
||||
#include <SFML/Graphics.hpp>
|
||||
#include "ansi_parser.hpp"
|
||||
#include <iostream>
|
||||
|
||||
using namespace fmt;
|
||||
|
||||
|
||||
#line 80 "ansi_parser.rl"
|
||||
#line 105 "ansi_parser.rl"
|
||||
|
||||
|
||||
|
||||
#line 12 "ansi_parser.cpp"
|
||||
#line 13 "ansi_parser.cpp"
|
||||
static const char _foo_actions[] = {
|
||||
0, 1, 0, 1, 3, 1, 4, 1,
|
||||
5, 1, 6, 1, 7, 1, 11, 1,
|
||||
12, 2, 1, 8, 2, 1, 9, 2,
|
||||
12, 5, 3, 1, 10, 2
|
||||
5, 1, 6, 1, 7, 1, 8, 1,
|
||||
9, 1, 10, 1, 14, 1, 15, 2,
|
||||
1, 11, 2, 1, 12, 2, 15, 5,
|
||||
3, 1, 13, 2
|
||||
};
|
||||
|
||||
static const char _foo_key_offsets[] = {
|
||||
0, 0, 1, 2, 4, 6, 7, 8,
|
||||
9, 11, 14, 16, 19, 21, 24, 25,
|
||||
27, 28, 29, 30, 31
|
||||
0, 0, 1, 2, 8, 9, 11, 12,
|
||||
15, 16, 17, 18, 20, 23, 25, 28,
|
||||
30, 33, 34, 37, 38, 39, 40, 41,
|
||||
42
|
||||
};
|
||||
|
||||
static const int _foo_trans_keys[] = {
|
||||
27, 91, 51, 52, 56, 57, 59, 50,
|
||||
59, 48, 57, 59, 48, 57, 48, 57,
|
||||
59, 48, 57, 48, 57, 109, 48, 57,
|
||||
109, 56, 57, 59, 50, 109, 27, 27,
|
||||
0
|
||||
27, 91, 50, 51, 52, 55, 48, 54,
|
||||
109, 55, 109, 109, 56, 57, 109, 59,
|
||||
50, 59, 48, 57, 59, 48, 57, 48,
|
||||
57, 59, 48, 57, 48, 57, 109, 48,
|
||||
57, 109, 56, 57, 109, 59, 50, 109,
|
||||
109, 27, 27, 0
|
||||
};
|
||||
|
||||
static const char _foo_single_lengths[] = {
|
||||
0, 1, 1, 2, 2, 1, 1, 1,
|
||||
0, 1, 0, 1, 0, 1, 1, 2,
|
||||
1, 1, 1, 1, 1
|
||||
0, 1, 1, 4, 1, 2, 1, 3,
|
||||
1, 1, 1, 0, 1, 0, 1, 0,
|
||||
1, 1, 3, 1, 1, 1, 1, 1,
|
||||
1
|
||||
};
|
||||
|
||||
static const char _foo_range_lengths[] = {
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
1, 1, 1, 1, 1, 1, 0, 0,
|
||||
0, 0, 0, 0, 0
|
||||
0, 0, 0, 1, 0, 0, 0, 0,
|
||||
0, 0, 0, 1, 1, 1, 1, 1,
|
||||
1, 0, 0, 0, 0, 0, 0, 0,
|
||||
0
|
||||
};
|
||||
|
||||
static const char _foo_index_offsets[] = {
|
||||
0, 0, 2, 4, 7, 10, 12, 14,
|
||||
16, 18, 21, 23, 26, 28, 31, 33,
|
||||
36, 38, 40, 42, 44
|
||||
0, 0, 2, 4, 10, 12, 15, 17,
|
||||
21, 23, 25, 27, 29, 32, 34, 37,
|
||||
39, 42, 44, 48, 50, 52, 54, 56,
|
||||
58
|
||||
};
|
||||
|
||||
static const char _foo_trans_targs[] = {
|
||||
2, 1, 3, 0, 4, 15, 0, 5,
|
||||
14, 0, 6, 0, 7, 0, 8, 0,
|
||||
9, 0, 10, 9, 0, 11, 0, 12,
|
||||
11, 0, 13, 0, 20, 13, 0, 20,
|
||||
0, 16, 18, 0, 17, 0, 7, 0,
|
||||
20, 0, 2, 1, 2, 1, 0
|
||||
2, 1, 3, 0, 5, 7, 18, 22,
|
||||
4, 0, 24, 0, 6, 24, 0, 24,
|
||||
0, 8, 17, 24, 0, 9, 0, 10,
|
||||
0, 11, 0, 12, 0, 13, 12, 0,
|
||||
14, 0, 15, 14, 0, 16, 0, 24,
|
||||
16, 0, 24, 0, 19, 21, 24, 0,
|
||||
20, 0, 10, 0, 24, 0, 24, 0,
|
||||
2, 1, 2, 1, 0
|
||||
};
|
||||
|
||||
static const char _foo_trans_actions[] = {
|
||||
0, 7, 0, 0, 13, 13, 0, 0,
|
||||
0, 0, 0, 0, 3, 0, 0, 0,
|
||||
1, 0, 17, 0, 0, 1, 0, 20,
|
||||
0, 0, 1, 0, 26, 0, 0, 9,
|
||||
0, 0, 0, 0, 0, 0, 5, 0,
|
||||
11, 0, 0, 7, 15, 23, 0
|
||||
0, 7, 0, 0, 19, 19, 19, 19,
|
||||
19, 0, 0, 0, 0, 17, 0, 15,
|
||||
0, 0, 0, 0, 0, 0, 0, 3,
|
||||
0, 0, 0, 1, 0, 23, 0, 0,
|
||||
1, 0, 26, 0, 0, 1, 0, 32,
|
||||
0, 0, 9, 0, 0, 0, 0, 0,
|
||||
0, 0, 5, 0, 11, 0, 13, 0,
|
||||
0, 7, 21, 29, 0
|
||||
};
|
||||
|
||||
static const char _foo_eof_actions[] = {
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 15
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
21
|
||||
};
|
||||
|
||||
static const int foo_start = 19;
|
||||
static const int foo_first_final = 19;
|
||||
static const int foo_start = 23;
|
||||
static const int foo_first_final = 23;
|
||||
static const int foo_error = 0;
|
||||
|
||||
static const int foo_en_main = 19;
|
||||
static const int foo_en_main = 23;
|
||||
|
||||
|
||||
#line 83 "ansi_parser.rl"
|
||||
#line 108 "ansi_parser.rl"
|
||||
|
||||
#include <ftxui/screen/terminal.hpp>
|
||||
|
||||
|
|
@ -98,7 +110,7 @@ ANSIParser::ANSIParser(sf::Color default_fg, sf::Color default_bg) :
|
|||
}
|
||||
}
|
||||
|
||||
bool ANSIParser::parse(std::wstring_view codes, WriteCB write) {
|
||||
bool ANSIParser::parse(std::wstring_view codes, ColorCB color_cb, WriteCB write_cb) {
|
||||
const wchar_t *start = NULL;
|
||||
int cs = 0;
|
||||
unsigned int value = 0;
|
||||
|
|
@ -110,14 +122,14 @@ bool ANSIParser::parse(std::wstring_view codes, WriteCB write) {
|
|||
sf::Color &target = color;
|
||||
|
||||
|
||||
#line 105 "ansi_parser.cpp"
|
||||
#line 117 "ansi_parser.cpp"
|
||||
{
|
||||
cs = foo_start;
|
||||
}
|
||||
|
||||
#line 108 "ansi_parser.rl"
|
||||
#line 133 "ansi_parser.rl"
|
||||
|
||||
#line 108 "ansi_parser.cpp"
|
||||
#line 120 "ansi_parser.cpp"
|
||||
{
|
||||
int _klen;
|
||||
unsigned int _trans;
|
||||
|
|
@ -191,13 +203,13 @@ _match:
|
|||
switch ( *_acts++ )
|
||||
{
|
||||
case 0:
|
||||
#line 13 "ansi_parser.rl"
|
||||
#line 14 "ansi_parser.rl"
|
||||
{
|
||||
start = p;
|
||||
}
|
||||
break;
|
||||
case 1:
|
||||
#line 17 "ansi_parser.rl"
|
||||
#line 18 "ansi_parser.rl"
|
||||
{
|
||||
value = 0;
|
||||
size_t len = p - start;
|
||||
|
|
@ -221,56 +233,79 @@ _match:
|
|||
}
|
||||
break;
|
||||
case 2:
|
||||
#line 39 "ansi_parser.rl"
|
||||
{ }
|
||||
#line 40 "ansi_parser.rl"
|
||||
{
|
||||
color_cb(color, bgcolor);
|
||||
}
|
||||
break;
|
||||
case 3:
|
||||
#line 40 "ansi_parser.rl"
|
||||
#line 43 "ansi_parser.rl"
|
||||
{
|
||||
target = color;
|
||||
}
|
||||
break;
|
||||
case 4:
|
||||
#line 43 "ansi_parser.rl"
|
||||
#line 46 "ansi_parser.rl"
|
||||
{
|
||||
target = bgcolor;
|
||||
}
|
||||
break;
|
||||
case 5:
|
||||
#line 47 "ansi_parser.rl"
|
||||
#line 50 "ansi_parser.rl"
|
||||
{
|
||||
write(bgcolor, color, (*p));
|
||||
write_cb((*p));
|
||||
}
|
||||
break;
|
||||
case 6:
|
||||
#line 51 "ansi_parser.rl"
|
||||
#line 54 "ansi_parser.rl"
|
||||
{ color = $default_fg; }
|
||||
break;
|
||||
case 7:
|
||||
#line 52 "ansi_parser.rl"
|
||||
#line 55 "ansi_parser.rl"
|
||||
{ bgcolor = $default_bg; }
|
||||
break;
|
||||
case 8:
|
||||
#line 54 "ansi_parser.rl"
|
||||
{ target.r = value; }
|
||||
#line 56 "ansi_parser.rl"
|
||||
{
|
||||
color = {100,100,100}; // UNDO THIS
|
||||
bgcolor = $default_bg; // THIS TOO
|
||||
color_cb(color, bgcolor);
|
||||
}
|
||||
break;
|
||||
case 9:
|
||||
#line 55 "ansi_parser.rl"
|
||||
{ target.g = value; }
|
||||
#line 61 "ansi_parser.rl"
|
||||
{
|
||||
color = $default_fg;
|
||||
bgcolor = $default_bg;
|
||||
color_cb(color, bgcolor);
|
||||
}
|
||||
break;
|
||||
case 10:
|
||||
#line 56 "ansi_parser.rl"
|
||||
{ target.b = value; }
|
||||
#line 66 "ansi_parser.rl"
|
||||
{
|
||||
}
|
||||
break;
|
||||
case 11:
|
||||
#line 57 "ansi_parser.rl"
|
||||
{ value = 0; }
|
||||
#line 69 "ansi_parser.rl"
|
||||
{ target.r = value; }
|
||||
break;
|
||||
case 12:
|
||||
#line 58 "ansi_parser.rl"
|
||||
{ }
|
||||
#line 70 "ansi_parser.rl"
|
||||
{ target.g = value; }
|
||||
break;
|
||||
#line 247 "ansi_parser.cpp"
|
||||
case 13:
|
||||
#line 71 "ansi_parser.rl"
|
||||
{ target.b = value; }
|
||||
break;
|
||||
case 14:
|
||||
#line 72 "ansi_parser.rl"
|
||||
{ value = 0; }
|
||||
break;
|
||||
case 15:
|
||||
#line 73 "ansi_parser.rl"
|
||||
{}
|
||||
break;
|
||||
#line 279 "ansi_parser.cpp"
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -286,11 +321,11 @@ _again:
|
|||
unsigned int __nacts = (unsigned int) *__acts++;
|
||||
while ( __nacts-- > 0 ) {
|
||||
switch ( *__acts++ ) {
|
||||
case 12:
|
||||
#line 58 "ansi_parser.rl"
|
||||
{ }
|
||||
case 15:
|
||||
#line 73 "ansi_parser.rl"
|
||||
{}
|
||||
break;
|
||||
#line 265 "ansi_parser.cpp"
|
||||
#line 297 "ansi_parser.cpp"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -298,7 +333,17 @@ _again:
|
|||
_out: {}
|
||||
}
|
||||
|
||||
#line 109 "ansi_parser.rl"
|
||||
#line 134 "ansi_parser.rl"
|
||||
|
||||
return p - pe == 0;
|
||||
bool good = p - pe == 0;
|
||||
|
||||
if(!good) {
|
||||
println("FAIL AT {}", p - pe);
|
||||
// dear cthuhlu, save me from the pain that is wstring
|
||||
for(int i = 0; i < 100; i++) {
|
||||
print("{}", char(p[i]));
|
||||
}
|
||||
}
|
||||
|
||||
return good;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue