[buffer/serialize] Minor renames in Ragel machines As per my previous review on: https://github.com/harfbuzz/harfbuzz/pull/2687
diff --git a/src/hb-buffer-deserialize-text.hh b/src/hb-buffer-deserialize-text.hh index c437718..10cc160 100644 --- a/src/hb-buffer-deserialize-text.hh +++ b/src/hb-buffer-deserialize-text.hh
@@ -402,24 +402,24 @@ }; static const char _deserialize_text_trans_actions[] = { - 0, 0, 0, 0, 0, 1, 2, 0, - 2, 2, 3, 3, 3, 0, 2, 2, - 2, 0, 0, 2, 2, 2, 0, 0, - 2, 2, 2, 2, 2, 0, 0, 4, - 2, 2, 2, 0, 0, 5, 0, 6, - 5, 5, 0, 0, 0, 7, 7, 7, - 0, 8, 9, 9, 9, 8, 8, 0, - 0, 10, 11, 12, 11, 11, 13, 13, - 13, 7, 14, 14, 7, 15, 16, 15, - 15, 0, 10 + 0, 0, 0, 0, 1, 0, 2, 0, + 3, 3, 4, 4, 4, 0, 3, 3, + 3, 0, 0, 3, 3, 3, 0, 0, + 3, 3, 3, 3, 3, 0, 0, 5, + 3, 3, 3, 0, 0, 6, 7, 8, + 6, 6, 0, 0, 0, 9, 9, 9, + 0, 10, 11, 11, 11, 10, 10, 0, + 0, 12, 13, 14, 13, 13, 15, 15, + 15, 9, 16, 16, 9, 17, 18, 17, + 17, 0, 12 }; static const char _deserialize_text_eof_actions[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 5, 0, 0, 0, - 7, 7, 8, 0, 0, 8, 11, 13, - 13, 11, 7, 15, 15, 7, 8 + 0, 0, 0, 0, 6, 0, 0, 0, + 9, 9, 10, 0, 0, 10, 13, 15, + 15, 13, 9, 17, 17, 9, 10 }; static const int deserialize_text_start = 1; @@ -429,7 +429,7 @@ static const int deserialize_text_en_main = 1; -#line 124 "hb-buffer-deserialize-text.rl" +#line 132 "hb-buffer-deserialize-text.rl" static hb_bool_t @@ -482,13 +482,20 @@ goto _again; switch ( _deserialize_text_trans_actions[_trans] ) { - case 2: + case 1: +#line 38 "hb-buffer-deserialize-text.rl" + { + memset (&info, 0, sizeof (info)); + memset (&pos , 0, sizeof (pos )); +} + break; + case 3: #line 51 "hb-buffer-deserialize-text.rl" { tok = p; } break; - case 10: + case 12: #line 55 "hb-buffer-deserialize-text.rl" { if (unlikely (buffer->content_type != HB_BUFFER_CONTENT_TYPE_GLYPHS)) @@ -502,7 +509,21 @@ } } break; - case 9: + case 7: +#line 67 "hb-buffer-deserialize-text.rl" + { + if (unlikely (buffer->content_type != HB_BUFFER_CONTENT_TYPE_UNICODE)) + { + if (buffer->content_type != HB_BUFFER_CONTENT_TYPE_INVALID) { + buffer->clear(); + return false; + } + assert (buffer->len == 0); + buffer->content_type = HB_BUFFER_CONTENT_TYPE_UNICODE; + } +} + break; + case 11: #line 79 "hb-buffer-deserialize-text.rl" { if (!hb_font_glyph_from_string (font, @@ -511,31 +532,30 @@ return false; } break; - case 6: + case 8: #line 86 "hb-buffer-deserialize-text.rl" {if (!parse_hex (tok, p, &info.codepoint )) return false; } break; - case 14: + case 16: #line 88 "hb-buffer-deserialize-text.rl" { if (!parse_uint (tok, p, &info.cluster )) return false; } break; - case 4: + case 5: #line 89 "hb-buffer-deserialize-text.rl" { if (!parse_int (tok, p, &pos.x_offset )) return false; } break; - case 16: + case 18: #line 90 "hb-buffer-deserialize-text.rl" { if (!parse_int (tok, p, &pos.y_offset )) return false; } break; - case 12: + case 14: #line 91 "hb-buffer-deserialize-text.rl" { if (!parse_int (tok, p, &pos.x_advance)) return false; } break; - case 1: -#line 38 "hb-buffer-deserialize-text.rl" + case 2: +#line 51 "hb-buffer-deserialize-text.rl" { - memset (&info, 0, sizeof (info)); - memset (&pos , 0, sizeof (pos )); + tok = p; } #line 67 "hb-buffer-deserialize-text.rl" { @@ -550,7 +570,7 @@ } } break; - case 8: + case 10: #line 79 "hb-buffer-deserialize-text.rl" { if (!hb_font_glyph_from_string (font, @@ -567,7 +587,7 @@ *end_ptr = p; } break; - case 5: + case 6: #line 86 "hb-buffer-deserialize-text.rl" {if (!parse_hex (tok, p, &info.codepoint )) return false; } #line 43 "hb-buffer-deserialize-text.rl" @@ -579,7 +599,7 @@ *end_ptr = p; } break; - case 7: + case 9: #line 88 "hb-buffer-deserialize-text.rl" { if (!parse_uint (tok, p, &info.cluster )) return false; } #line 43 "hb-buffer-deserialize-text.rl" @@ -591,7 +611,7 @@ *end_ptr = p; } break; - case 15: + case 17: #line 90 "hb-buffer-deserialize-text.rl" { if (!parse_int (tok, p, &pos.y_offset )) return false; } #line 43 "hb-buffer-deserialize-text.rl" @@ -603,7 +623,7 @@ *end_ptr = p; } break; - case 11: + case 13: #line 91 "hb-buffer-deserialize-text.rl" { if (!parse_int (tok, p, &pos.x_advance)) return false; } #line 43 "hb-buffer-deserialize-text.rl" @@ -615,7 +635,7 @@ *end_ptr = p; } break; - case 13: + case 15: #line 92 "hb-buffer-deserialize-text.rl" { if (!parse_int (tok, p, &pos.y_advance)) return false; } #line 43 "hb-buffer-deserialize-text.rl" @@ -627,7 +647,7 @@ *end_ptr = p; } break; - case 3: + case 4: #line 38 "hb-buffer-deserialize-text.rl" { memset (&info, 0, sizeof (info)); @@ -650,7 +670,7 @@ } } break; -#line 654 "hb-buffer-deserialize-text.hh" +#line 674 "hb-buffer-deserialize-text.hh" } _again: @@ -662,7 +682,7 @@ if ( p == eof ) { switch ( _deserialize_text_eof_actions[cs] ) { - case 8: + case 10: #line 79 "hb-buffer-deserialize-text.rl" { if (!hb_font_glyph_from_string (font, @@ -679,7 +699,7 @@ *end_ptr = p; } break; - case 5: + case 6: #line 86 "hb-buffer-deserialize-text.rl" {if (!parse_hex (tok, p, &info.codepoint )) return false; } #line 43 "hb-buffer-deserialize-text.rl" @@ -691,7 +711,7 @@ *end_ptr = p; } break; - case 7: + case 9: #line 88 "hb-buffer-deserialize-text.rl" { if (!parse_uint (tok, p, &info.cluster )) return false; } #line 43 "hb-buffer-deserialize-text.rl" @@ -703,7 +723,7 @@ *end_ptr = p; } break; - case 15: + case 17: #line 90 "hb-buffer-deserialize-text.rl" { if (!parse_int (tok, p, &pos.y_offset )) return false; } #line 43 "hb-buffer-deserialize-text.rl" @@ -715,7 +735,7 @@ *end_ptr = p; } break; - case 11: + case 13: #line 91 "hb-buffer-deserialize-text.rl" { if (!parse_int (tok, p, &pos.x_advance)) return false; } #line 43 "hb-buffer-deserialize-text.rl" @@ -727,7 +747,7 @@ *end_ptr = p; } break; - case 13: + case 15: #line 92 "hb-buffer-deserialize-text.rl" { if (!parse_int (tok, p, &pos.y_advance)) return false; } #line 43 "hb-buffer-deserialize-text.rl" @@ -739,14 +759,14 @@ *end_ptr = p; } break; -#line 743 "hb-buffer-deserialize-text.hh" +#line 763 "hb-buffer-deserialize-text.hh" } } _out: {} } -#line 148 "hb-buffer-deserialize-text.rl" +#line 156 "hb-buffer-deserialize-text.rl" *end_ptr = p;