From 8de58b97574dfb8fb0b262ef5b19f11904da1236 Mon Sep 17 00:00:00 2001 From: Daniel Zaoui Date: Sun, 16 Feb 2014 08:54:49 +0200 Subject: [PATCH] Eolian/Lexer: rename signals to events. --- src/bin/eolian/eo1_generator.c | 2 +- src/lib/eolian/eo_definitions.c | 8 +- src/lib/eolian/eo_definitions.h | 8 +- src/lib/eolian/eo_lexer.c | 1120 +++++++++++++++---------------- src/lib/eolian/eo_lexer.h | 2 +- src/lib/eolian/eo_lexer.rl | 48 +- 6 files changed, 594 insertions(+), 594 deletions(-) diff --git a/src/bin/eolian/eo1_generator.c b/src/bin/eolian/eo1_generator.c index 9a424b82fd..d04c92a5e2 100644 --- a/src/bin/eolian/eo1_generator.c +++ b/src/bin/eolian/eo1_generator.c @@ -24,7 +24,7 @@ _@#class_class_constructor(Eo_Class *klass)\n\ EO_OP_FUNC_SENTINEL\n\ };\n\ eo_class_funcs_set(klass, func_desc);\n\ - _user_@#class_class_constructor(klass);\n\ + _@#class_class_constructor(klass);\n\ }\n\ \n\ static const Eo_Op_Description @#class_op_desc[] = {@#list_op\n\ diff --git a/src/lib/eolian/eo_definitions.c b/src/lib/eolian/eo_definitions.c index 12d8df4b86..751cf9dbf1 100644 --- a/src/lib/eolian/eo_definitions.c +++ b/src/lib/eolian/eo_definitions.c @@ -73,7 +73,7 @@ eo_definitions_method_def_free(Eo_Method_Def *meth) } void -eo_definitions_signal_def_free(Eo_Signal_Def *sgn) +eo_definitions_event_def_free(Eo_Event_Def *sgn) { if (sgn->name) eina_stringshare_del(sgn->name); @@ -123,7 +123,7 @@ eo_definitions_class_def_free(Eo_Class_Def *kls) Eina_List *l; Eo_Property_Def *prop; Eo_Method_Def *meth; - Eo_Signal_Def *sgn; + Eo_Event_Def *sgn; Eo_Implement_Def *impl; if (kls->name) @@ -151,8 +151,8 @@ eo_definitions_class_def_free(Eo_Class_Def *kls) EINA_LIST_FREE(kls->methods, meth) eo_definitions_method_def_free(meth); - EINA_LIST_FREE(kls->signals, sgn) - eo_definitions_signal_def_free(sgn); + EINA_LIST_FREE(kls->events, sgn) + eo_definitions_event_def_free(sgn); if (kls->dflt_ctor) eo_definitions_dfltctor_def_free(kls->dflt_ctor); if (kls->dflt_dtor) eo_definitions_dfltdtor_def_free(kls->dflt_dtor); diff --git a/src/lib/eolian/eo_definitions.h b/src/lib/eolian/eo_definitions.h index 23e9ed453e..892d8cb259 100644 --- a/src/lib/eolian/eo_definitions.h +++ b/src/lib/eolian/eo_definitions.h @@ -84,11 +84,11 @@ typedef struct _eo_method_def /* SIGNAL */ -typedef struct _eo_signal_def +typedef struct _eo_event_def { const char *name; const char *comment; -} Eo_Signal_Def; +} Eo_Event_Def; /* DEFAULT CONSTRUCTOR */ @@ -139,7 +139,7 @@ typedef struct _eo_class_def const char *legacy_prefix; Eina_List *inherits; Eina_List *implements; - Eina_List *signals; + Eina_List *events; Eina_List *constructors; Eina_List *destructors; Eina_List *properties; @@ -160,7 +160,7 @@ void eo_definitions_method_def_free(Eo_Method_Def *prop); void eo_definitions_class_def_free(Eo_Class_Def *kls); -void eo_definitions_signal_def_free(Eo_Signal_Def *sgn); +void eo_definitions_event_def_free(Eo_Event_Def *sgn); void eo_definitions_dfltctor_def_free(Eo_DfltCtor_Def *ctor); void eo_definitions_dfltdtor_def_free(Eo_DfltDtor_Def *dtor); diff --git a/src/lib/eolian/eo_lexer.c b/src/lib/eolian/eo_lexer.c index 97c4eb66eb..c8e4a271a8 100644 --- a/src/lib/eolian/eo_lexer.c +++ b/src/lib/eolian/eo_lexer.c @@ -1,5 +1,5 @@ -#line 1 "/home/daniel/e17/eolian/src/lib/eo_lexer.rl" +#line 1 "eo_lexer.rl" #include #include #include @@ -245,11 +245,11 @@ _eo_tokenizer_accessor_get(Eo_Tokenizer *toknz, Eo_Accessor_Type type) return accessor; } -static Eo_Signal_Def* -_eo_tokenizer_signal_get(Eo_Tokenizer *toknz, char *p) +static Eo_Event_Def* +_eo_tokenizer_event_get(Eo_Tokenizer *toknz, char *p) { - Eo_Signal_Def *sgn = calloc(1, sizeof(Eo_Signal_Def)); - if (sgn == NULL) ABORT(toknz, "calloc Eo_Signal_Def failure"); + Eo_Event_Def *sgn = calloc(1, sizeof(Eo_Event_Def)); + if (sgn == NULL) ABORT(toknz, "calloc Eo_Event_Def failure"); sgn->name = _eo_tokenizer_token_get(toknz, p); @@ -290,7 +290,7 @@ _eo_tokenizer_implement_get(Eo_Tokenizer *toknz, char *p) } -#line 364 "/home/daniel/e17/eolian/src/lib/eo_lexer.rl" +#line 364 "eo_lexer.rl" @@ -367,31 +367,31 @@ static const short _eo_tokenizer_key_offsets[] = { 616, 617, 622, 626, 627, 628, 638, 640, 643, 647, 648, 649, 650, 651, 652, 653, 654, 655, 660, 664, 665, 666, 676, 678, - 681, 685, 686, 687, 688, 689, 690, 691, - 692, 693, 697, 705, 713, 726, 731, 735, - 736, 737, 738, 739, 740, 752, 757, 761, - 762, 766, 767, 768, 769, 770, 771, 775, - 784, 791, 798, 809, 813, 827, 837, 844, - 856, 861, 862, 867, 868, 869, 870, 871, - 872, 875, 882, 889, 897, 898, 902, 909, - 917, 921, 922, 923, 924, 934, 936, 939, - 949, 961, 968, 980, 981, 982, 983, 984, - 985, 986, 987, 988, 992, 1000, 1007, 1019, - 1024, 1031, 1032, 1033, 1034, 1035, 1036, 1037, - 1038, 1039, 1040, 1041, 1042, 1043, 1047, 1054, - 1061, 1069, 1070, 1071, 1072, 1073, 1074, 1078, - 1079, 1080, 1081, 1082, 1083, 1084, 1085, 1086, - 1090, 1091, 1092, 1093, 1094, 1095, 1099, 1107, - 1115, 1127, 1131, 1143, 1144, 1145, 1155, 1157, - 1160, 1168, 1169, 1177, 1180, 1182, 1189, 1200, - 1203, 1205, 1212, 1220, 1228, 1232, 1232, 1233, - 1242, 1245, 1247, 1258, 1262, 1262, 1263, 1271, - 1274, 1276, 1277, 1278, 1279, 1280, 1289, 1292, - 1294, 1301, 1302, 1311, 1314, 1316, 1317, 1318, - 1319, 1320, 1324, 1324, 1325, 1334, 1337, 1339, - 1346, 1347, 1359, 1362, 1364, 1365, 1372, 1375, - 1378, 1379, 1386, 1389, 1392, 1394, 1395, 1398, - 1399, 1400, 1401 + 681, 685, 686, 687, 688, 689, 693, 701, + 709, 721, 725, 737, 738, 739, 749, 751, + 754, 762, 763, 764, 765, 766, 767, 768, + 769, 770, 771, 775, 783, 791, 804, 809, + 813, 814, 815, 816, 817, 818, 830, 835, + 839, 840, 844, 845, 846, 847, 848, 849, + 853, 862, 869, 876, 887, 891, 905, 915, + 922, 934, 939, 940, 945, 946, 947, 948, + 949, 950, 953, 960, 967, 975, 976, 980, + 987, 995, 999, 1000, 1001, 1002, 1012, 1014, + 1017, 1027, 1039, 1046, 1058, 1059, 1060, 1061, + 1062, 1063, 1064, 1065, 1066, 1070, 1078, 1085, + 1097, 1102, 1109, 1110, 1111, 1112, 1113, 1114, + 1115, 1116, 1117, 1118, 1119, 1120, 1121, 1125, + 1132, 1139, 1147, 1148, 1149, 1150, 1151, 1152, + 1156, 1157, 1158, 1159, 1160, 1161, 1162, 1163, + 1164, 1168, 1176, 1179, 1181, 1188, 1199, 1202, + 1204, 1211, 1219, 1227, 1231, 1231, 1232, 1241, + 1244, 1246, 1257, 1261, 1261, 1262, 1270, 1273, + 1275, 1276, 1277, 1278, 1279, 1288, 1291, 1293, + 1300, 1301, 1310, 1313, 1315, 1316, 1317, 1318, + 1319, 1323, 1323, 1324, 1333, 1336, 1338, 1345, + 1346, 1358, 1361, 1363, 1364, 1371, 1374, 1377, + 1378, 1385, 1388, 1391, 1392, 1394, 1395, 1398, + 1399, 1400 }; static const char _eo_tokenizer_trans_keys[] = { @@ -480,97 +480,97 @@ static const char _eo_tokenizer_trans_keys[] = { 59, 115, 0, 32, 10, 59, 0, 32, 42, 64, 10, 95, 0, 32, 48, 57, 65, 90, 97, 122, 10, 42, 10, 42, - 47, 10, 123, 0, 32, 112, 108, 101, - 109, 101, 110, 116, 115, 10, 123, 0, - 32, 10, 125, 0, 32, 65, 90, 97, - 122, 58, 95, 48, 57, 65, 90, 97, - 122, 10, 58, 59, 95, 123, 0, 32, - 48, 57, 65, 90, 97, 122, 10, 59, - 123, 0, 32, 10, 108, 0, 32, 101, - 103, 97, 99, 121, 9, 10, 13, 32, - 59, 123, 0, 31, 65, 90, 97, 122, - 10, 59, 123, 0, 32, 10, 125, 0, - 32, 59, 10, 112, 0, 32, 97, 114, - 97, 109, 115, 10, 123, 0, 32, 10, - 58, 59, 0, 32, 65, 90, 97, 122, - 9, 13, 32, 65, 90, 97, 122, 95, - 48, 57, 65, 90, 97, 122, 10, 59, + 47, 10, 123, 0, 32, 101, 110, 116, + 115, 10, 123, 0, 32, 10, 125, 0, + 32, 65, 90, 97, 122, 44, 95, 48, + 57, 65, 90, 97, 122, 10, 44, 59, 95, 0, 32, 48, 57, 65, 90, 97, 122, 10, 59, 0, 32, 9, 10, 13, - 32, 47, 58, 59, 125, 0, 31, 65, - 90, 97, 122, 10, 58, 59, 125, 0, - 32, 65, 90, 97, 122, 95, 48, 57, - 65, 90, 97, 122, 9, 13, 32, 58, - 59, 95, 48, 57, 65, 90, 97, 122, - 9, 13, 32, 58, 59, 59, 10, 114, - 125, 0, 32, 101, 116, 117, 114, 110, - 9, 13, 32, 9, 13, 32, 65, 90, - 97, 122, 95, 48, 57, 65, 90, 97, - 122, 58, 95, 48, 57, 65, 90, 97, - 122, 58, 65, 90, 97, 122, 95, 48, - 57, 65, 90, 97, 122, 59, 95, 48, - 57, 65, 90, 97, 122, 10, 125, 0, - 32, 59, 42, 64, 10, 95, 0, 32, - 48, 57, 65, 90, 97, 122, 10, 42, - 10, 42, 47, 10, 58, 59, 125, 0, - 32, 65, 90, 97, 122, 9, 10, 13, - 32, 59, 123, 0, 31, 65, 90, 97, - 122, 95, 48, 57, 65, 90, 97, 122, - 10, 59, 95, 123, 0, 32, 48, 57, - 65, 90, 97, 122, 58, 59, 104, 101, - 114, 105, 116, 115, 10, 123, 0, 32, - 10, 125, 0, 32, 65, 90, 97, 122, + 32, 47, 125, 0, 31, 65, 90, 97, + 122, 42, 64, 10, 95, 0, 32, 48, + 57, 65, 90, 97, 122, 10, 42, 10, + 42, 47, 10, 125, 0, 32, 65, 90, + 97, 122, 59, 112, 108, 101, 109, 101, + 110, 116, 115, 10, 123, 0, 32, 10, + 125, 0, 32, 65, 90, 97, 122, 58, 95, 48, 57, 65, 90, 97, 122, 10, - 44, 95, 125, 0, 32, 48, 57, 65, - 90, 97, 122, 10, 44, 125, 0, 32, - 10, 0, 32, 65, 90, 97, 122, 59, - 103, 97, 99, 121, 95, 112, 114, 101, - 102, 105, 120, 10, 58, 0, 32, 10, - 0, 32, 65, 90, 97, 122, 95, 48, - 57, 65, 90, 97, 122, 59, 95, 48, - 57, 65, 90, 97, 122, 116, 104, 111, - 100, 115, 10, 123, 0, 32, 111, 112, - 101, 114, 116, 105, 101, 115, 10, 123, - 0, 32, 103, 110, 97, 108, 115, 10, - 123, 0, 32, 10, 125, 0, 32, 65, - 90, 97, 122, 44, 95, 48, 57, 65, - 90, 97, 122, 10, 44, 59, 95, 0, + 58, 59, 95, 123, 0, 32, 48, 57, + 65, 90, 97, 122, 10, 59, 123, 0, + 32, 10, 108, 0, 32, 101, 103, 97, + 99, 121, 9, 10, 13, 32, 59, 123, + 0, 31, 65, 90, 97, 122, 10, 59, + 123, 0, 32, 10, 125, 0, 32, 59, + 10, 112, 0, 32, 97, 114, 97, 109, + 115, 10, 123, 0, 32, 10, 58, 59, + 0, 32, 65, 90, 97, 122, 9, 13, + 32, 65, 90, 97, 122, 95, 48, 57, + 65, 90, 97, 122, 10, 59, 95, 0, 32, 48, 57, 65, 90, 97, 122, 10, 59, 0, 32, 9, 10, 13, 32, 47, - 125, 0, 31, 65, 90, 97, 122, 42, - 64, 10, 95, 0, 32, 48, 57, 65, - 90, 97, 122, 10, 42, 10, 42, 47, - 10, 125, 0, 32, 65, 90, 97, 122, - 59, 10, 47, 0, 32, 65, 90, 97, - 122, 10, 0, 32, 42, 47, 95, 48, - 57, 65, 90, 97, 122, 10, 47, 108, - 114, 125, 0, 32, 65, 90, 97, 122, + 58, 59, 125, 0, 31, 65, 90, 97, + 122, 10, 58, 59, 125, 0, 32, 65, + 90, 97, 122, 95, 48, 57, 65, 90, + 97, 122, 9, 13, 32, 58, 59, 95, + 48, 57, 65, 90, 97, 122, 9, 13, + 32, 58, 59, 59, 10, 114, 125, 0, + 32, 101, 116, 117, 114, 110, 9, 13, + 32, 9, 13, 32, 65, 90, 97, 122, + 95, 48, 57, 65, 90, 97, 122, 58, + 95, 48, 57, 65, 90, 97, 122, 58, + 65, 90, 97, 122, 95, 48, 57, 65, + 90, 97, 122, 59, 95, 48, 57, 65, + 90, 97, 122, 10, 125, 0, 32, 59, + 42, 64, 10, 95, 0, 32, 48, 57, + 65, 90, 97, 122, 10, 42, 10, 42, + 47, 10, 58, 59, 125, 0, 32, 65, + 90, 97, 122, 9, 10, 13, 32, 59, + 123, 0, 31, 65, 90, 97, 122, 95, + 48, 57, 65, 90, 97, 122, 10, 59, + 95, 123, 0, 32, 48, 57, 65, 90, + 97, 122, 58, 59, 104, 101, 114, 105, + 116, 115, 10, 123, 0, 32, 10, 125, + 0, 32, 65, 90, 97, 122, 95, 48, + 57, 65, 90, 97, 122, 10, 44, 95, + 125, 0, 32, 48, 57, 65, 90, 97, + 122, 10, 44, 125, 0, 32, 10, 0, + 32, 65, 90, 97, 122, 59, 103, 97, + 99, 121, 95, 112, 114, 101, 102, 105, + 120, 10, 58, 0, 32, 10, 0, 32, + 65, 90, 97, 122, 95, 48, 57, 65, + 90, 97, 122, 59, 95, 48, 57, 65, + 90, 97, 122, 116, 104, 111, 100, 115, + 10, 123, 0, 32, 111, 112, 101, 114, + 116, 105, 101, 115, 10, 123, 0, 32, + 10, 47, 0, 32, 65, 90, 97, 122, 10, 0, 32, 42, 47, 95, 48, 57, - 65, 90, 97, 122, 95, 101, 48, 57, - 65, 90, 97, 122, 95, 101, 48, 57, - 65, 90, 97, 122, 9, 13, 32, 47, - 59, 10, 47, 125, 0, 32, 65, 90, - 97, 122, 10, 0, 32, 42, 47, 9, - 13, 32, 42, 95, 48, 57, 65, 90, - 97, 122, 9, 13, 32, 47, 59, 10, - 47, 103, 112, 115, 125, 0, 32, 10, - 0, 32, 42, 47, 101, 97, 101, 59, + 65, 90, 97, 122, 10, 47, 108, 114, + 125, 0, 32, 65, 90, 97, 122, 10, + 0, 32, 42, 47, 95, 48, 57, 65, + 90, 97, 122, 95, 101, 48, 57, 65, + 90, 97, 122, 95, 101, 48, 57, 65, + 90, 97, 122, 9, 13, 32, 47, 59, 10, 47, 125, 0, 32, 65, 90, 97, - 122, 10, 0, 32, 42, 47, 95, 48, - 57, 65, 90, 97, 122, 59, 10, 47, - 108, 111, 112, 114, 125, 0, 32, 10, - 0, 32, 42, 47, 101, 98, 97, 101, - 9, 13, 32, 47, 59, 10, 47, 125, - 0, 32, 65, 90, 97, 122, 10, 0, - 32, 42, 47, 95, 48, 57, 65, 90, - 97, 122, 59, 10, 47, 99, 100, 105, - 108, 109, 112, 115, 125, 0, 32, 10, - 0, 32, 42, 47, 111, 9, 10, 13, - 32, 47, 0, 31, 10, 0, 32, 10, - 0, 32, 101, 9, 10, 13, 32, 47, - 0, 31, 10, 0, 32, 10, 0, 32, + 122, 10, 0, 32, 42, 47, 9, 13, + 32, 42, 95, 48, 57, 65, 90, 97, + 122, 9, 13, 32, 47, 59, 10, 47, + 103, 112, 115, 125, 0, 32, 10, 0, + 32, 42, 47, 101, 97, 101, 59, 10, + 47, 125, 0, 32, 65, 90, 97, 122, + 10, 0, 32, 42, 47, 95, 48, 57, + 65, 90, 97, 122, 59, 10, 47, 108, + 111, 112, 114, 125, 0, 32, 10, 0, + 32, 42, 47, 101, 98, 97, 101, 9, + 13, 32, 47, 59, 10, 47, 125, 0, + 32, 65, 90, 97, 122, 10, 0, 32, + 42, 47, 95, 48, 57, 65, 90, 97, + 122, 59, 10, 47, 99, 100, 101, 105, + 108, 109, 112, 125, 0, 32, 10, 0, + 32, 42, 47, 111, 9, 10, 13, 32, + 47, 0, 31, 10, 0, 32, 10, 0, + 32, 101, 9, 10, 13, 32, 47, 0, + 31, 10, 0, 32, 10, 0, 32, 118, 109, 110, 101, 10, 0, 32, 101, 114, - 105, 59, 0 + 59, 0 }; static const char _eo_tokenizer_single_lengths[] = { @@ -598,31 +598,31 @@ static const char _eo_tokenizer_single_lengths[] = { 1, 3, 2, 1, 1, 2, 2, 3, 2, 1, 1, 1, 1, 1, 1, 1, 1, 3, 2, 1, 1, 2, 2, 3, - 2, 1, 1, 1, 1, 1, 1, 1, - 1, 2, 2, 2, 5, 3, 2, 1, - 1, 1, 1, 1, 6, 3, 2, 1, - 2, 1, 1, 1, 1, 1, 2, 3, - 3, 1, 3, 2, 8, 4, 1, 6, - 5, 1, 3, 1, 1, 1, 1, 1, - 3, 3, 1, 2, 1, 0, 1, 2, - 2, 1, 1, 1, 2, 2, 3, 4, - 6, 1, 4, 1, 1, 1, 1, 1, - 1, 1, 1, 2, 2, 1, 4, 3, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 2, 1, 1, - 2, 1, 1, 1, 1, 1, 2, 1, - 1, 1, 1, 1, 1, 1, 1, 2, - 1, 1, 1, 1, 1, 2, 2, 2, + 2, 1, 1, 1, 1, 2, 2, 2, 4, 2, 6, 1, 1, 2, 2, 3, - 2, 1, 2, 1, 2, 1, 5, 1, - 2, 1, 2, 2, 4, 0, 1, 3, - 1, 2, 5, 4, 0, 1, 6, 1, - 2, 1, 1, 1, 1, 3, 1, 2, - 1, 1, 7, 1, 2, 1, 1, 1, - 1, 4, 0, 1, 3, 1, 2, 1, - 1, 10, 1, 2, 1, 5, 1, 1, - 1, 5, 1, 1, 2, 1, 1, 1, - 1, 1, 1 + 2, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 2, 2, 2, 5, 3, 2, + 1, 1, 1, 1, 1, 6, 3, 2, + 1, 2, 1, 1, 1, 1, 1, 2, + 3, 3, 1, 3, 2, 8, 4, 1, + 6, 5, 1, 3, 1, 1, 1, 1, + 1, 3, 3, 1, 2, 1, 0, 1, + 2, 2, 1, 1, 1, 2, 2, 3, + 4, 6, 1, 4, 1, 1, 1, 1, + 1, 1, 1, 1, 2, 2, 1, 4, + 3, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 2, 1, + 1, 2, 1, 1, 1, 1, 1, 2, + 1, 1, 1, 1, 1, 1, 1, 1, + 2, 2, 1, 2, 1, 5, 1, 2, + 1, 2, 2, 4, 0, 1, 3, 1, + 2, 5, 4, 0, 1, 6, 1, 2, + 1, 1, 1, 1, 3, 1, 2, 1, + 1, 7, 1, 2, 1, 1, 1, 1, + 4, 0, 1, 3, 1, 2, 1, 1, + 10, 1, 2, 1, 5, 1, 1, 1, + 5, 1, 1, 1, 2, 1, 1, 1, + 1, 1 }; static const char _eo_tokenizer_range_lengths[] = { @@ -650,31 +650,31 @@ static const char _eo_tokenizer_range_lengths[] = { 0, 1, 1, 0, 0, 4, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 4, 0, 0, - 1, 0, 0, 0, 0, 0, 0, 0, - 0, 1, 3, 3, 4, 1, 1, 0, - 0, 0, 0, 0, 3, 1, 1, 0, - 1, 0, 0, 0, 0, 0, 1, 3, - 2, 3, 4, 1, 3, 3, 3, 3, - 0, 0, 1, 0, 0, 0, 0, 0, - 0, 2, 3, 3, 0, 2, 3, 3, - 1, 0, 0, 0, 4, 0, 0, 3, - 3, 3, 4, 0, 0, 0, 0, 0, - 0, 0, 0, 1, 3, 3, 4, 1, - 3, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 1, 3, 3, - 3, 0, 0, 0, 0, 0, 1, 0, - 0, 0, 0, 0, 0, 0, 0, 1, - 0, 0, 0, 0, 0, 1, 3, 3, + 1, 0, 0, 0, 0, 1, 3, 3, 4, 1, 3, 0, 0, 4, 0, 0, - 3, 0, 3, 1, 0, 3, 3, 1, - 0, 3, 3, 3, 0, 0, 0, 3, - 1, 0, 3, 0, 0, 0, 1, 1, - 0, 0, 0, 0, 0, 3, 1, 0, - 3, 0, 1, 1, 0, 0, 0, 0, + 3, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 1, 3, 3, 4, 1, 1, + 0, 0, 0, 0, 0, 3, 1, 1, + 0, 1, 0, 0, 0, 0, 0, 1, + 3, 2, 3, 4, 1, 3, 3, 3, + 3, 0, 0, 1, 0, 0, 0, 0, + 0, 0, 2, 3, 3, 0, 2, 3, + 3, 1, 0, 0, 0, 4, 0, 0, + 3, 3, 3, 4, 0, 0, 0, 0, + 0, 0, 0, 0, 1, 3, 3, 4, + 1, 3, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 1, 3, + 3, 3, 0, 0, 0, 0, 0, 1, + 0, 0, 0, 0, 0, 0, 0, 0, + 1, 3, 1, 0, 3, 3, 1, 0, + 3, 3, 3, 0, 0, 0, 3, 1, + 0, 3, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 3, 1, 0, 3, - 0, 1, 1, 0, 0, 1, 1, 1, - 0, 1, 1, 1, 0, 0, 1, 0, - 0, 0, 0 + 0, 1, 1, 0, 0, 0, 0, 0, + 0, 0, 0, 3, 1, 0, 3, 0, + 1, 1, 0, 0, 1, 1, 1, 0, + 1, 1, 1, 0, 0, 0, 1, 0, + 0, 0 }; static const short _eo_tokenizer_index_offsets[] = { @@ -702,31 +702,31 @@ static const short _eo_tokenizer_index_offsets[] = { 663, 665, 670, 674, 676, 678, 685, 688, 692, 696, 698, 700, 702, 704, 706, 708, 710, 712, 717, 721, 723, 725, 732, 735, - 739, 743, 745, 747, 749, 751, 753, 755, - 757, 759, 763, 769, 775, 785, 790, 794, - 796, 798, 800, 802, 804, 814, 819, 823, - 825, 829, 831, 833, 835, 837, 839, 843, - 850, 856, 861, 869, 873, 885, 893, 898, - 908, 914, 916, 921, 923, 925, 927, 929, - 931, 935, 941, 946, 952, 954, 957, 962, - 968, 972, 974, 976, 978, 985, 988, 992, - 1000, 1010, 1015, 1024, 1026, 1028, 1030, 1032, - 1034, 1036, 1038, 1040, 1044, 1050, 1055, 1064, - 1069, 1074, 1076, 1078, 1080, 1082, 1084, 1086, - 1088, 1090, 1092, 1094, 1096, 1098, 1102, 1107, - 1112, 1118, 1120, 1122, 1124, 1126, 1128, 1132, - 1134, 1136, 1138, 1140, 1142, 1144, 1146, 1148, - 1152, 1154, 1156, 1158, 1160, 1162, 1166, 1172, - 1178, 1187, 1191, 1201, 1203, 1205, 1212, 1215, - 1219, 1225, 1227, 1233, 1236, 1239, 1244, 1253, - 1256, 1259, 1264, 1270, 1276, 1281, 1282, 1284, - 1291, 1294, 1297, 1306, 1311, 1312, 1314, 1322, - 1325, 1328, 1330, 1332, 1334, 1336, 1343, 1346, - 1349, 1354, 1356, 1365, 1368, 1371, 1373, 1375, - 1377, 1379, 1384, 1385, 1387, 1394, 1397, 1400, - 1405, 1407, 1419, 1422, 1425, 1427, 1434, 1437, - 1440, 1442, 1449, 1452, 1455, 1458, 1460, 1463, - 1465, 1467, 1469 + 739, 743, 745, 747, 749, 751, 755, 761, + 767, 776, 780, 790, 792, 794, 801, 804, + 808, 814, 816, 818, 820, 822, 824, 826, + 828, 830, 832, 836, 842, 848, 858, 863, + 867, 869, 871, 873, 875, 877, 887, 892, + 896, 898, 902, 904, 906, 908, 910, 912, + 916, 923, 929, 934, 942, 946, 958, 966, + 971, 981, 987, 989, 994, 996, 998, 1000, + 1002, 1004, 1008, 1014, 1019, 1025, 1027, 1030, + 1035, 1041, 1045, 1047, 1049, 1051, 1058, 1061, + 1065, 1073, 1083, 1088, 1097, 1099, 1101, 1103, + 1105, 1107, 1109, 1111, 1113, 1117, 1123, 1128, + 1137, 1142, 1147, 1149, 1151, 1153, 1155, 1157, + 1159, 1161, 1163, 1165, 1167, 1169, 1171, 1175, + 1180, 1185, 1191, 1193, 1195, 1197, 1199, 1201, + 1205, 1207, 1209, 1211, 1213, 1215, 1217, 1219, + 1221, 1225, 1231, 1234, 1237, 1242, 1251, 1254, + 1257, 1262, 1268, 1274, 1279, 1280, 1282, 1289, + 1292, 1295, 1304, 1309, 1310, 1312, 1320, 1323, + 1326, 1328, 1330, 1332, 1334, 1341, 1344, 1347, + 1352, 1354, 1363, 1366, 1369, 1371, 1373, 1375, + 1377, 1382, 1383, 1385, 1392, 1395, 1398, 1403, + 1405, 1417, 1420, 1423, 1425, 1432, 1435, 1438, + 1440, 1447, 1450, 1453, 1455, 1458, 1460, 1463, + 1465, 1467 }; static const short _eo_tokenizer_indicies[] = { @@ -824,177 +824,177 @@ static const short _eo_tokenizer_indicies[] = { 291, 291, 291, 287, 293, 294, 292, 293, 294, 295, 292, 296, 297, 283, 231, 298, 231, 299, 231, 300, 231, 301, 231, 302, - 231, 303, 231, 304, 231, 305, 231, 306, - 307, 305, 231, 308, 310, 307, 309, 309, - 231, 312, 311, 311, 311, 311, 231, 314, - 312, 315, 311, 316, 313, 311, 311, 311, - 231, 318, 307, 319, 317, 231, 320, 321, - 319, 231, 322, 231, 323, 231, 324, 231, - 325, 231, 326, 231, 328, 329, 328, 328, - 330, 332, 327, 331, 331, 231, 334, 335, - 336, 333, 231, 337, 338, 335, 231, 307, - 231, 339, 340, 336, 231, 341, 231, 342, - 231, 343, 231, 344, 231, 345, 231, 346, - 347, 345, 231, 348, 349, 350, 347, 351, - 351, 231, 349, 349, 349, 352, 352, 231, - 353, 353, 353, 353, 231, 355, 356, 353, - 354, 353, 353, 353, 231, 358, 350, 357, - 231, 350, 360, 350, 350, 361, 349, 350, - 362, 359, 351, 351, 231, 360, 349, 350, - 362, 359, 351, 351, 231, 363, 363, 363, - 363, 231, 364, 364, 364, 365, 366, 363, - 363, 363, 363, 231, 367, 367, 367, 349, - 350, 231, 368, 231, 369, 370, 371, 368, - 231, 372, 231, 373, 231, 374, 231, 375, - 231, 376, 231, 377, 377, 377, 231, 377, - 377, 377, 378, 378, 231, 379, 379, 379, - 379, 231, 380, 379, 379, 379, 379, 231, - 381, 231, 382, 382, 231, 383, 383, 383, - 383, 231, 384, 383, 383, 383, 383, 231, - 386, 371, 385, 231, 335, 231, 387, 231, - 388, 231, 389, 390, 388, 390, 390, 390, - 231, 392, 393, 391, 392, 393, 394, 391, - 396, 397, 398, 400, 395, 399, 399, 231, - 401, 334, 401, 401, 335, 336, 333, 402, - 402, 231, 403, 403, 403, 403, 231, 405, - 406, 403, 407, 404, 403, 403, 403, 231, - 311, 231, 408, 231, 409, 231, 410, 231, - 411, 231, 412, 231, 413, 231, 414, 231, - 415, 416, 414, 231, 417, 419, 416, 418, - 418, 231, 420, 420, 420, 420, 231, 422, - 423, 420, 424, 421, 420, 420, 420, 231, - 426, 427, 419, 425, 231, 428, 427, 418, - 418, 231, 429, 231, 430, 231, 431, 231, - 432, 231, 433, 231, 434, 231, 435, 231, - 436, 231, 437, 231, 438, 231, 439, 231, - 440, 231, 441, 442, 440, 231, 443, 442, - 444, 444, 231, 445, 445, 445, 445, 231, - 446, 445, 445, 445, 445, 231, 447, 231, - 448, 231, 449, 231, 450, 231, 451, 231, - 452, 453, 451, 231, 454, 231, 455, 231, - 456, 231, 457, 231, 458, 231, 459, 231, - 460, 231, 461, 231, 462, 463, 461, 231, - 464, 231, 465, 231, 466, 231, 467, 231, - 468, 231, 469, 470, 468, 231, 471, 473, - 470, 472, 472, 231, 474, 474, 474, 474, - 474, 231, 476, 474, 477, 474, 475, 474, - 474, 474, 231, 479, 480, 478, 231, 480, - 471, 480, 480, 481, 473, 470, 472, 472, - 231, 482, 231, 483, 231, 484, 485, 483, - 485, 485, 485, 231, 487, 488, 486, 487, - 488, 489, 486, 491, 493, 490, 492, 492, - 231, 494, 231, 497, 498, 496, 499, 499, - 495, 497, 496, 500, 1, 5, 501, 10, - 10, 10, 10, 501, 504, 505, 507, 508, - 509, 503, 506, 506, 502, 504, 503, 510, - 512, 68, 511, 71, 71, 71, 71, 511, - 71, 513, 71, 71, 71, 511, 71, 514, - 71, 71, 71, 511, 96, 96, 96, 97, - 515, 516, 517, 511, 520, 521, 523, 519, - 522, 522, 518, 520, 519, 524, 107, 111, - 525, 113, 113, 113, 113, 113, 113, 113, - 113, 525, 116, 116, 116, 117, 526, 527, - 528, 525, 531, 532, 533, 534, 535, 536, - 530, 529, 531, 530, 537, 127, 131, 538, - 539, 538, 540, 538, 541, 538, 542, 538, - 545, 546, 548, 544, 547, 547, 543, 545, - 544, 549, 146, 150, 550, 154, 154, 154, - 154, 550, 551, 550, 554, 555, 556, 557, - 558, 559, 560, 553, 552, 554, 553, 561, - 563, 171, 562, 564, 562, 565, 562, 566, - 562, 567, 562, 207, 207, 207, 208, 568, - 569, 570, 562, 573, 574, 576, 572, 575, - 575, 571, 573, 572, 577, 218, 222, 578, - 226, 226, 226, 226, 578, 579, 578, 582, - 583, 584, 585, 586, 587, 588, 589, 590, - 591, 581, 580, 582, 581, 592, 594, 243, - 593, 595, 593, 260, 598, 260, 260, 599, - 597, 596, 598, 597, 596, 602, 601, 600, - 603, 593, 286, 606, 286, 286, 607, 605, - 604, 606, 605, 604, 610, 609, 608, 611, - 612, 593, 613, 593, 616, 615, 614, 617, - 593, 618, 593, 619, 593, 620, 593, 0 + 303, 301, 231, 304, 306, 303, 305, 305, + 231, 307, 307, 307, 307, 307, 231, 309, + 307, 310, 307, 308, 307, 307, 307, 231, + 312, 313, 311, 231, 313, 304, 313, 313, + 314, 306, 303, 305, 305, 231, 315, 231, + 316, 231, 317, 318, 316, 318, 318, 318, + 231, 320, 321, 319, 320, 321, 322, 319, + 324, 326, 323, 325, 325, 231, 327, 231, + 328, 231, 329, 231, 330, 231, 331, 231, + 332, 231, 333, 231, 334, 231, 335, 231, + 336, 337, 335, 231, 338, 340, 337, 339, + 339, 231, 342, 341, 341, 341, 341, 231, + 344, 342, 345, 341, 346, 343, 341, 341, + 341, 231, 348, 337, 349, 347, 231, 350, + 351, 349, 231, 352, 231, 353, 231, 354, + 231, 355, 231, 356, 231, 358, 359, 358, + 358, 360, 362, 357, 361, 361, 231, 364, + 365, 366, 363, 231, 367, 368, 365, 231, + 337, 231, 369, 370, 366, 231, 371, 231, + 372, 231, 373, 231, 374, 231, 375, 231, + 376, 377, 375, 231, 378, 379, 380, 377, + 381, 381, 231, 379, 379, 379, 382, 382, + 231, 383, 383, 383, 383, 231, 385, 386, + 383, 384, 383, 383, 383, 231, 388, 380, + 387, 231, 380, 390, 380, 380, 391, 379, + 380, 392, 389, 381, 381, 231, 390, 379, + 380, 392, 389, 381, 381, 231, 393, 393, + 393, 393, 231, 394, 394, 394, 395, 396, + 393, 393, 393, 393, 231, 397, 397, 397, + 379, 380, 231, 398, 231, 399, 400, 401, + 398, 231, 402, 231, 403, 231, 404, 231, + 405, 231, 406, 231, 407, 407, 407, 231, + 407, 407, 407, 408, 408, 231, 409, 409, + 409, 409, 231, 410, 409, 409, 409, 409, + 231, 411, 231, 412, 412, 231, 413, 413, + 413, 413, 231, 414, 413, 413, 413, 413, + 231, 416, 401, 415, 231, 365, 231, 417, + 231, 418, 231, 419, 420, 418, 420, 420, + 420, 231, 422, 423, 421, 422, 423, 424, + 421, 426, 427, 428, 430, 425, 429, 429, + 231, 431, 364, 431, 431, 365, 366, 363, + 432, 432, 231, 433, 433, 433, 433, 231, + 435, 436, 433, 437, 434, 433, 433, 433, + 231, 341, 231, 438, 231, 439, 231, 440, + 231, 441, 231, 442, 231, 443, 231, 444, + 231, 445, 446, 444, 231, 447, 449, 446, + 448, 448, 231, 450, 450, 450, 450, 231, + 452, 453, 450, 454, 451, 450, 450, 450, + 231, 456, 457, 449, 455, 231, 458, 457, + 448, 448, 231, 459, 231, 460, 231, 461, + 231, 462, 231, 463, 231, 464, 231, 465, + 231, 466, 231, 467, 231, 468, 231, 469, + 231, 470, 231, 471, 472, 470, 231, 473, + 472, 474, 474, 231, 475, 475, 475, 475, + 231, 476, 475, 475, 475, 475, 231, 477, + 231, 478, 231, 479, 231, 480, 231, 481, + 231, 482, 483, 481, 231, 484, 231, 485, + 231, 486, 231, 487, 231, 488, 231, 489, + 231, 490, 231, 491, 231, 492, 493, 491, + 231, 496, 497, 495, 498, 498, 494, 496, + 495, 499, 1, 5, 500, 10, 10, 10, + 10, 500, 503, 504, 506, 507, 508, 502, + 505, 505, 501, 503, 502, 509, 511, 68, + 510, 71, 71, 71, 71, 510, 71, 512, + 71, 71, 71, 510, 71, 513, 71, 71, + 71, 510, 96, 96, 96, 97, 514, 515, + 516, 510, 519, 520, 522, 518, 521, 521, + 517, 519, 518, 523, 107, 111, 524, 113, + 113, 113, 113, 113, 113, 113, 113, 524, + 116, 116, 116, 117, 525, 526, 527, 524, + 530, 531, 532, 533, 534, 535, 529, 528, + 530, 529, 536, 127, 131, 537, 538, 537, + 539, 537, 540, 537, 541, 537, 544, 545, + 547, 543, 546, 546, 542, 544, 543, 548, + 146, 150, 549, 154, 154, 154, 154, 549, + 550, 549, 553, 554, 555, 556, 557, 558, + 559, 552, 551, 553, 552, 560, 562, 171, + 561, 563, 561, 564, 561, 565, 561, 566, + 561, 207, 207, 207, 208, 567, 568, 569, + 561, 572, 573, 575, 571, 574, 574, 570, + 572, 571, 576, 218, 222, 577, 226, 226, + 226, 226, 577, 578, 577, 581, 582, 583, + 584, 585, 586, 587, 588, 589, 590, 580, + 579, 581, 580, 591, 593, 243, 592, 594, + 592, 260, 597, 260, 260, 598, 596, 595, + 597, 596, 595, 601, 600, 599, 602, 592, + 286, 605, 286, 286, 606, 604, 603, 605, + 604, 603, 609, 608, 607, 610, 592, 611, + 612, 592, 613, 592, 616, 615, 614, 617, + 592, 618, 592, 619, 592, 0 }; static const short _eo_tokenizer_trans_targs[] = { - 322, 0, 0, 1, 322, 2, 322, 4, - 5, 4, 3, 322, 4, 4, 322, 5, + 321, 0, 0, 1, 321, 2, 321, 4, + 5, 4, 3, 321, 4, 4, 321, 5, 6, 7, 8, 8, 9, 18, 22, 10, 11, 12, 13, 14, 15, 16, 17, 4, - 4, 322, 19, 20, 21, 23, 24, 25, + 4, 321, 19, 20, 21, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, - 326, 43, 43, 44, 45, 326, 45, 46, - 46, 46, 47, 326, 48, 326, 50, 49, - 51, 52, 53, 52, 53, 53, 326, 55, - 56, 57, 58, 59, 60, 61, 326, 63, - 64, 65, 66, 67, 68, 69, 332, 326, + 325, 43, 43, 44, 45, 325, 45, 46, + 46, 46, 47, 325, 48, 325, 50, 49, + 51, 52, 53, 52, 53, 53, 325, 55, + 56, 57, 58, 59, 60, 61, 325, 63, + 64, 65, 66, 67, 68, 69, 331, 325, 70, 71, 72, 73, 73, 74, 74, 74, - 75, 333, 335, 76, 76, 77, 335, 78, - 335, 79, 339, 335, 80, 81, 82, 83, - 83, 84, 84, 84, 85, 340, 342, 86, - 86, 87, 342, 88, 342, 90, 90, 342, - 92, 93, 94, 95, 95, 342, 97, 97, - 342, 349, 98, 98, 99, 349, 100, 349, - 102, 102, 101, 349, 102, 102, 349, 354, - 104, 104, 105, 106, 354, 106, 107, 107, - 107, 108, 354, 109, 354, 111, 112, 113, - 114, 115, 116, 117, 354, 119, 120, 121, - 122, 123, 124, 125, 126, 127, 128, 354, - 130, 131, 132, 133, 133, 354, 135, 136, - 137, 138, 139, 140, 141, 361, 354, 142, + 75, 332, 334, 76, 76, 77, 334, 78, + 334, 79, 338, 334, 80, 81, 82, 83, + 83, 84, 84, 84, 85, 339, 341, 86, + 86, 87, 341, 88, 341, 90, 90, 341, + 92, 93, 94, 95, 95, 341, 97, 97, + 341, 348, 98, 98, 99, 348, 100, 348, + 102, 102, 101, 348, 102, 102, 348, 353, + 104, 104, 105, 106, 353, 106, 107, 107, + 107, 108, 353, 109, 353, 111, 112, 113, + 114, 115, 116, 117, 353, 119, 120, 121, + 122, 123, 124, 125, 126, 127, 128, 353, + 130, 131, 132, 133, 133, 353, 135, 136, + 137, 138, 139, 140, 141, 360, 353, 142, 143, 144, 145, 145, 146, 146, 146, 147, - 362, 364, 148, 148, 149, 364, 150, 364, - 152, 152, 151, 364, 152, 152, 364, 369, - 154, 154, 155, 156, 369, 156, 157, 157, - 157, 158, 369, 159, 369, 161, 162, 163, + 361, 363, 148, 148, 149, 363, 150, 363, + 152, 152, 151, 363, 152, 152, 363, 368, + 154, 154, 155, 156, 368, 156, 157, 157, + 157, 158, 368, 159, 368, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 170, - 373, 176, 170, 170, 373, 369, 172, 173, - 173, 174, 174, 174, 175, 375, 176, 369, + 372, 176, 170, 170, 372, 368, 172, 173, + 173, 174, 174, 174, 175, 374, 176, 368, 178, 179, 180, 181, 182, 183, 184, 185, - 186, 186, 377, 192, 186, 186, 377, 369, - 188, 189, 189, 190, 190, 190, 191, 379, - 192, 369, 194, 195, 196, 197, 198, 199, - 200, 201, 201, 202, 202, 203, 260, 204, - 259, 205, 205, 202, 206, 205, 205, 206, - 206, 207, 208, 209, 210, 211, 212, 213, - 256, 213, 214, 257, 216, 213, 213, 214, - 216, 214, 215, 216, 217, 218, 219, 220, - 221, 222, 222, 223, 223, 224, 228, 230, - 225, 226, 227, 227, 228, 227, 227, 229, - 229, 250, 233, 231, 232, 224, 228, 232, - 234, 234, 235, 249, 236, 237, 238, 239, - 240, 241, 242, 243, 244, 245, 246, 247, - 248, 248, 248, 251, 252, 252, 253, 253, - 253, 254, 255, 229, 229, 224, 228, 230, - 233, 256, 257, 258, 213, 213, 214, 216, - 369, 262, 263, 264, 265, 266, 267, 267, - 268, 268, 269, 273, 270, 271, 271, 272, - 273, 271, 271, 272, 272, 369, 275, 276, - 277, 278, 279, 280, 281, 282, 283, 284, - 285, 285, 286, 286, 287, 288, 382, 290, - 291, 292, 293, 294, 294, 369, 296, 297, - 298, 299, 300, 301, 302, 303, 303, 369, - 305, 306, 307, 308, 309, 309, 310, 310, - 311, 321, 312, 313, 313, 314, 313, 313, - 314, 315, 316, 317, 317, 318, 318, 318, - 319, 320, 310, 310, 311, 321, 369, 322, - 323, 323, 324, 325, 322, 322, 326, 327, - 327, 328, 329, 330, 331, 334, 326, 326, - 42, 54, 62, 326, 326, 326, 335, 336, - 336, 337, 338, 341, 335, 335, 335, 335, - 335, 342, 343, 343, 344, 345, 346, 347, - 348, 342, 342, 89, 91, 96, 342, 349, - 350, 350, 351, 352, 353, 349, 349, 349, - 354, 355, 355, 356, 357, 358, 359, 360, - 363, 354, 354, 103, 110, 118, 129, 134, - 354, 354, 354, 364, 365, 365, 366, 367, - 368, 364, 364, 364, 369, 370, 370, 371, - 372, 376, 380, 381, 383, 384, 385, 386, - 369, 369, 153, 160, 369, 374, 374, 171, - 369, 374, 374, 177, 369, 378, 378, 187, - 369, 378, 378, 193, 261, 274, 369, 382, - 382, 289, 295, 304, 369 + 186, 186, 376, 192, 186, 186, 376, 368, + 188, 189, 189, 190, 190, 190, 191, 378, + 192, 368, 194, 195, 196, 197, 197, 198, + 198, 199, 209, 200, 201, 201, 202, 201, + 201, 202, 203, 204, 205, 205, 206, 206, + 206, 207, 208, 198, 198, 199, 209, 368, + 211, 212, 213, 214, 215, 216, 217, 218, + 218, 219, 219, 220, 277, 221, 276, 222, + 222, 219, 223, 222, 222, 223, 223, 224, + 225, 226, 227, 228, 229, 230, 273, 230, + 231, 274, 233, 230, 230, 231, 233, 231, + 232, 233, 234, 235, 236, 237, 238, 239, + 239, 240, 240, 241, 245, 247, 242, 243, + 244, 244, 245, 244, 244, 246, 246, 267, + 250, 248, 249, 241, 245, 249, 251, 251, + 252, 266, 253, 254, 255, 256, 257, 258, + 259, 260, 261, 262, 263, 264, 265, 265, + 265, 268, 269, 269, 270, 270, 270, 271, + 272, 246, 246, 241, 245, 247, 250, 273, + 274, 275, 230, 230, 231, 233, 368, 279, + 280, 281, 282, 283, 284, 284, 285, 285, + 286, 290, 287, 288, 288, 289, 290, 288, + 288, 289, 289, 368, 292, 293, 294, 295, + 296, 297, 298, 299, 300, 301, 302, 302, + 303, 303, 304, 305, 382, 307, 308, 309, + 310, 311, 311, 368, 313, 314, 315, 316, + 317, 318, 319, 320, 320, 368, 321, 322, + 322, 323, 324, 321, 321, 325, 326, 326, + 327, 328, 329, 330, 333, 325, 325, 42, + 54, 62, 325, 325, 325, 334, 335, 335, + 336, 337, 340, 334, 334, 334, 334, 334, + 341, 342, 342, 343, 344, 345, 346, 347, + 341, 341, 89, 91, 96, 341, 348, 349, + 349, 350, 351, 352, 348, 348, 348, 353, + 354, 354, 355, 356, 357, 358, 359, 362, + 353, 353, 103, 110, 118, 129, 134, 353, + 353, 353, 363, 364, 364, 365, 366, 367, + 363, 363, 363, 368, 369, 369, 370, 371, + 375, 379, 380, 381, 383, 384, 385, 368, + 368, 153, 160, 368, 373, 373, 171, 368, + 373, 373, 177, 368, 377, 377, 187, 368, + 377, 377, 193, 210, 278, 291, 368, 382, + 382, 306, 312, 368 }; static const short _eo_tokenizer_trans_actions[] = { @@ -1035,47 +1035,47 @@ static const short _eo_tokenizer_trans_actions[] = { 0, 0, 0, 0, 0, 0, 0, 0, 21, 278, 344, 0, 0, 1, 51, 187, 0, 0, 1, 3, 0, 1, 0, 0, - 1, 165, 0, 0, 0, 0, 0, 0, - 0, 0, 1, 0, 1, 3, 0, 0, - 0, 27, 293, 27, 27, 0, 1, 0, - 1, 0, 0, 0, 0, 0, 0, 29, - 29, 296, 29, 299, 29, 0, 1, 0, - 0, 1, 0, 1, 0, 0, 0, 0, - 0, 0, 1, 0, 1, 0, 0, 3, - 3, 0, 35, 305, 35, 0, 1, 0, - 1, 0, 0, 0, 33, 33, 33, 0, - 0, 1, 0, 0, 0, 0, 0, 0, - 0, 0, 3, 0, 39, 0, 3, 0, - 41, 0, 1, 0, 0, 1, 3, 0, - 1, 0, 0, 37, 308, 37, 37, 311, - 37, 0, 3, 0, 31, 302, 31, 31, - 159, 0, 0, 0, 0, 0, 0, 1, - 0, 1, 3, 0, 0, 11, 263, 11, - 11, 0, 1, 0, 1, 157, 0, 0, + 1, 165, 0, 0, 0, 0, 1, 0, + 1, 3, 0, 0, 13, 266, 13, 0, + 1, 0, 0, 0, 0, 1, 3, 0, + 1, 0, 0, 15, 269, 272, 15, 161, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 1, 0, 1, 3, 0, 19, 0, - 0, 0, 0, 0, 1, 169, 0, 0, - 0, 0, 0, 0, 0, 0, 1, 167, + 1, 0, 1, 3, 0, 0, 0, 27, + 293, 27, 27, 0, 1, 0, 1, 0, + 0, 0, 0, 0, 0, 29, 29, 296, + 29, 299, 29, 0, 1, 0, 0, 1, + 0, 1, 0, 0, 0, 0, 0, 0, + 1, 0, 1, 0, 0, 3, 3, 0, + 35, 305, 35, 0, 1, 0, 1, 0, + 0, 0, 33, 33, 33, 0, 0, 1, + 0, 0, 0, 0, 0, 0, 0, 0, + 3, 0, 39, 0, 3, 0, 41, 0, + 1, 0, 0, 1, 3, 0, 1, 0, + 0, 37, 308, 37, 37, 311, 37, 0, + 3, 0, 31, 302, 31, 31, 159, 0, 0, 0, 0, 0, 0, 1, 0, 1, - 3, 0, 0, 13, 266, 13, 0, 1, - 0, 0, 0, 0, 1, 3, 0, 1, - 0, 0, 15, 269, 272, 15, 161, 195, - 0, 1, 326, 329, 197, 199, 59, 0, - 1, 326, 329, 329, 329, 0, 61, 65, - 0, 0, 0, 63, 227, 57, 75, 0, - 1, 326, 329, 0, 77, 81, 79, 239, - 73, 97, 0, 1, 326, 51, 51, 51, - 0, 99, 101, 0, 0, 0, 95, 111, - 0, 1, 326, 329, 0, 113, 115, 109, - 127, 0, 1, 326, 51, 51, 51, 51, - 0, 129, 133, 0, 0, 0, 0, 0, - 131, 248, 125, 145, 0, 1, 326, 329, - 0, 147, 149, 143, 173, 0, 1, 326, - 329, 329, 51, 51, 51, 51, 51, 0, - 175, 183, 0, 0, 179, 0, 1, 0, - 284, 23, 281, 0, 181, 0, 1, 0, - 290, 25, 287, 0, 0, 0, 177, 0, - 1, 0, 0, 0, 171 + 3, 0, 0, 11, 263, 11, 11, 0, + 1, 0, 1, 157, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 1, + 0, 1, 3, 0, 19, 0, 0, 0, + 0, 0, 1, 169, 0, 0, 0, 0, + 0, 0, 0, 0, 1, 167, 195, 0, + 1, 326, 329, 197, 199, 59, 0, 1, + 326, 329, 329, 329, 0, 61, 65, 0, + 0, 0, 63, 227, 57, 75, 0, 1, + 326, 329, 0, 77, 81, 79, 239, 73, + 97, 0, 1, 326, 51, 51, 51, 0, + 99, 101, 0, 0, 0, 95, 111, 0, + 1, 326, 329, 0, 113, 115, 109, 127, + 0, 1, 326, 51, 51, 51, 51, 0, + 129, 133, 0, 0, 0, 0, 0, 131, + 248, 125, 145, 0, 1, 326, 329, 0, + 147, 149, 143, 173, 0, 1, 326, 329, + 329, 51, 51, 51, 51, 51, 0, 175, + 183, 0, 0, 179, 0, 1, 0, 284, + 23, 281, 0, 181, 0, 1, 0, 290, + 25, 287, 0, 0, 0, 0, 177, 0, + 1, 0, 0, 171 }; static const short _eo_tokenizer_to_state_actions[] = { @@ -1119,15 +1119,15 @@ static const short _eo_tokenizer_to_state_actions[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 47, 0, 0, 0, 47, 0, - 0, 0, 0, 0, 0, 0, 0, 47, + 0, 47, 0, 0, 0, 47, 0, 0, 0, 0, 0, 0, 0, 0, 47, 0, 0, 0, 0, 0, 0, 47, 0, 0, - 0, 0, 47, 0, 0, 0, 0, 0, 0, 0, 0, 0, 47, 0, 0, 0, 0, 47, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 47, 0, 0, 0, 0, + 47, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0 + 0, 0 }; static const short _eo_tokenizer_from_state_actions[] = { @@ -1171,15 +1171,15 @@ static const short _eo_tokenizer_from_state_actions[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 49, 0, 0, 0, 49, 0, - 0, 0, 0, 0, 0, 0, 0, 49, + 0, 49, 0, 0, 0, 49, 0, 0, 0, 0, 0, 0, 0, 0, 49, 0, 0, 0, 0, 0, 0, 49, 0, 0, - 0, 0, 49, 0, 0, 0, 0, 0, 0, 0, 0, 0, 49, 0, 0, 0, 0, 49, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 49, 0, 0, 0, 0, + 49, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0 + 0, 0 }; static const short _eo_tokenizer_eof_trans[] = { @@ -1223,32 +1223,32 @@ static const short _eo_tokenizer_eof_trans[] = { 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, - 232, 232, 0, 501, 502, 502, 0, 511, - 512, 512, 512, 512, 516, 517, 512, 0, - 525, 526, 526, 527, 528, 526, 0, 538, - 539, 539, 539, 539, 539, 0, 550, 551, - 551, 551, 0, 562, 563, 563, 563, 563, - 563, 569, 570, 563, 0, 578, 579, 579, - 579, 0, 593, 594, 594, 597, 597, 601, - 594, 605, 605, 609, 594, 594, 615, 594, - 594, 594, 594 + 232, 0, 500, 501, 501, 0, 510, 511, + 511, 511, 511, 515, 516, 511, 0, 524, + 525, 525, 526, 527, 525, 0, 537, 538, + 538, 538, 538, 538, 0, 549, 550, 550, + 550, 0, 561, 562, 562, 562, 562, 562, + 568, 569, 562, 0, 577, 578, 578, 578, + 0, 592, 593, 593, 596, 596, 600, 593, + 604, 604, 608, 593, 593, 593, 615, 593, + 593, 593 }; -static const int eo_tokenizer_start = 322; -static const int eo_tokenizer_first_final = 322; +static const int eo_tokenizer_start = 321; +static const int eo_tokenizer_first_final = 321; static const int eo_tokenizer_error = -1; -static const int eo_tokenizer_en_tokenize_accessor = 326; -static const int eo_tokenizer_en_tokenize_params = 335; -static const int eo_tokenizer_en_tokenize_property = 342; -static const int eo_tokenizer_en_tokenize_properties = 349; -static const int eo_tokenizer_en_tokenize_method = 354; -static const int eo_tokenizer_en_tokenize_methods = 364; -static const int eo_tokenizer_en_tokenize_class = 369; -static const int eo_tokenizer_en_main = 322; +static const int eo_tokenizer_en_tokenize_accessor = 325; +static const int eo_tokenizer_en_tokenize_params = 334; +static const int eo_tokenizer_en_tokenize_property = 341; +static const int eo_tokenizer_en_tokenize_properties = 348; +static const int eo_tokenizer_en_tokenize_method = 353; +static const int eo_tokenizer_en_tokenize_methods = 363; +static const int eo_tokenizer_en_tokenize_class = 368; +static const int eo_tokenizer_en_main = 321; -#line 918 "/home/daniel/e17/eolian/src/lib/eo_lexer.rl" +#line 918 "eo_lexer.rl" Eina_Bool @@ -1279,7 +1279,7 @@ eo_tokenizer_walk(Eo_Tokenizer *toknz, const char *source) toknz->act = 0; } -#line 940 "/home/daniel/e17/eolian/src/lib/eo_lexer.rl" +#line 940 "eo_lexer.rl" while (!done) { @@ -1392,28 +1392,28 @@ _eof_trans: switch ( *_acts++ ) { case 0: -#line 298 "/home/daniel/e17/eolian/src/lib/eo_lexer.rl" +#line 298 "eo_lexer.rl" { toknz->current_line += 1; DBG("inc[%d] %d", toknz->cs, toknz->current_line); } break; case 1: -#line 303 "/home/daniel/e17/eolian/src/lib/eo_lexer.rl" +#line 303 "eo_lexer.rl" { toknz->saved.line = toknz->current_line; DBG("save line[%d] %d", toknz->cs, toknz->current_line); } break; case 2: -#line 308 "/home/daniel/e17/eolian/src/lib/eo_lexer.rl" +#line 308 "eo_lexer.rl" { toknz->saved.tok = ( toknz->p); DBG("save token[%d] %p %c", toknz->cs, ( toknz->p), *( toknz->p)); } break; case 3: -#line 381 "/home/daniel/e17/eolian/src/lib/eo_lexer.rl" +#line 381 "eo_lexer.rl" { if (toknz->tmp.accessor->ret.type != NULL) ABORT(toknz, "accessor has already a return type"); @@ -1422,7 +1422,7 @@ _eof_trans: } break; case 4: -#line 388 "/home/daniel/e17/eolian/src/lib/eo_lexer.rl" +#line 388 "eo_lexer.rl" { if (toknz->tmp.accessor->ret.comment != NULL) ABORT(toknz, "accessor return type has already a comment"); @@ -1431,19 +1431,19 @@ _eof_trans: } break; case 5: -#line 395 "/home/daniel/e17/eolian/src/lib/eo_lexer.rl" +#line 395 "eo_lexer.rl" { toknz->tmp.accessor->legacy = _eo_tokenizer_token_get(toknz, ( toknz->p)); } break; case 6: -#line 407 "/home/daniel/e17/eolian/src/lib/eo_lexer.rl" +#line 407 "eo_lexer.rl" { toknz->tmp.accessor_param = _eo_tokenizer_accessor_param_get(toknz, ( toknz->p)); } break; case 7: -#line 411 "/home/daniel/e17/eolian/src/lib/eo_lexer.rl" +#line 411 "eo_lexer.rl" { toknz->tmp.accessor_param->attrs = _eo_tokenizer_token_get(toknz, ( toknz->p)); toknz->tmp.accessor->params = @@ -1452,7 +1452,7 @@ _eof_trans: } break; case 8: -#line 438 "/home/daniel/e17/eolian/src/lib/eo_lexer.rl" +#line 438 "eo_lexer.rl" { const char *c = _eo_tokenizer_token_get(toknz, ( toknz->p)-2); if (toknz->tmp.param == NULL) @@ -1462,7 +1462,7 @@ _eof_trans: } break; case 9: -#line 446 "/home/daniel/e17/eolian/src/lib/eo_lexer.rl" +#line 446 "eo_lexer.rl" { toknz->tmp.param = _eo_tokenizer_param_get(toknz, ( toknz->p)); if (toknz->tmp.prop) @@ -1475,7 +1475,7 @@ _eof_trans: } break; case 10: -#line 536 "/home/daniel/e17/eolian/src/lib/eo_lexer.rl" +#line 536 "eo_lexer.rl" { if (toknz->tmp.prop != NULL) ABORT(toknz, "there is a pending property definition %s", toknz->tmp.prop->name); @@ -1483,7 +1483,7 @@ _eof_trans: } break; case 11: -#line 573 "/home/daniel/e17/eolian/src/lib/eo_lexer.rl" +#line 573 "eo_lexer.rl" { if (toknz->tmp.meth->ret.type != NULL) ABORT(toknz, "method '%s' has already a return type", toknz->tmp.meth->name); @@ -1492,7 +1492,7 @@ _eof_trans: } break; case 12: -#line 580 "/home/daniel/e17/eolian/src/lib/eo_lexer.rl" +#line 580 "eo_lexer.rl" { if (toknz->tmp.meth->ret.comment != NULL) ABORT(toknz, "method '%s' return type has already a comment", toknz->tmp.meth->name); @@ -1501,20 +1501,20 @@ _eof_trans: } break; case 13: -#line 587 "/home/daniel/e17/eolian/src/lib/eo_lexer.rl" +#line 587 "eo_lexer.rl" { toknz->tmp.meth->legacy = _eo_tokenizer_token_get(toknz, ( toknz->p)); } break; case 14: -#line 591 "/home/daniel/e17/eolian/src/lib/eo_lexer.rl" +#line 591 "eo_lexer.rl" { toknz->tmp.meth->obj_const = EINA_TRUE; INF(" obj const"); } break; case 15: -#line 647 "/home/daniel/e17/eolian/src/lib/eo_lexer.rl" +#line 647 "eo_lexer.rl" { if (toknz->tmp.meth != NULL) ABORT(toknz, "there is a pending method definition %s", toknz->tmp.meth->name); @@ -1522,30 +1522,30 @@ _eof_trans: } break; case 16: -#line 678 "/home/daniel/e17/eolian/src/lib/eo_lexer.rl" +#line 678 "eo_lexer.rl" { const char *base = _eo_tokenizer_token_get(toknz, ( toknz->p)); toknz->tmp.str_items = eina_list_append(toknz->tmp.str_items, base); } break; case 17: -#line 729 "/home/daniel/e17/eolian/src/lib/eo_lexer.rl" +#line 729 "eo_lexer.rl" { - toknz->tmp.signal = _eo_tokenizer_signal_get(toknz, ( toknz->p)); - toknz->tmp.kls->signals = eina_list_append(toknz->tmp.kls->signals, toknz->tmp.signal); + toknz->tmp.event = _eo_tokenizer_event_get(toknz, ( toknz->p)); + toknz->tmp.kls->events = eina_list_append(toknz->tmp.kls->events, toknz->tmp.event); } break; case 18: -#line 734 "/home/daniel/e17/eolian/src/lib/eo_lexer.rl" +#line 734 "eo_lexer.rl" { - if (toknz->tmp.signal->comment != NULL) - ABORT(toknz, "signal %s has already a comment", toknz->tmp.signal->name); - toknz->tmp.signal->comment = _eo_tokenizer_token_get(toknz, ( toknz->p)-2); - toknz->tmp.signal = NULL; + if (toknz->tmp.event->comment != NULL) + ABORT(toknz, "event %s has already a comment", toknz->tmp.event->name); + toknz->tmp.event->comment = _eo_tokenizer_token_get(toknz, ( toknz->p)-2); + toknz->tmp.event = NULL; } break; case 19: -#line 741 "/home/daniel/e17/eolian/src/lib/eo_lexer.rl" +#line 741 "eo_lexer.rl" { if (toknz->tmp.kls->dflt_ctor != NULL) ABORT(toknz, "A default constructor has already been defined"); @@ -1553,7 +1553,7 @@ _eof_trans: } break; case 20: -#line 747 "/home/daniel/e17/eolian/src/lib/eo_lexer.rl" +#line 747 "eo_lexer.rl" { if (toknz->tmp.kls->legacy_prefix != NULL) ABORT(toknz, "A legacy prefix has already been given"); @@ -1561,7 +1561,7 @@ _eof_trans: } break; case 21: -#line 753 "/home/daniel/e17/eolian/src/lib/eo_lexer.rl" +#line 753 "eo_lexer.rl" { if (toknz->tmp.kls->dflt_dtor != NULL) ABORT(toknz, "A default destructor has already been defined"); @@ -1569,7 +1569,7 @@ _eof_trans: } break; case 22: -#line 759 "/home/daniel/e17/eolian/src/lib/eo_lexer.rl" +#line 759 "eo_lexer.rl" { if (toknz->tmp.kls->dflt_ctor == NULL) ABORT(toknz, "No default constructor is defined for the comment"); @@ -1579,7 +1579,7 @@ _eof_trans: } break; case 23: -#line 767 "/home/daniel/e17/eolian/src/lib/eo_lexer.rl" +#line 767 "eo_lexer.rl" { if (toknz->tmp.kls->dflt_dtor == NULL) ABORT(toknz, "No default destructor is defined for the comment"); @@ -1589,14 +1589,14 @@ _eof_trans: } break; case 24: -#line 781 "/home/daniel/e17/eolian/src/lib/eo_lexer.rl" +#line 781 "eo_lexer.rl" { toknz->tmp.impl = _eo_tokenizer_implement_get(toknz, ( toknz->p)); toknz->tmp.kls->implements = eina_list_append(toknz->tmp.kls->implements, toknz->tmp.impl); } break; case 25: -#line 786 "/home/daniel/e17/eolian/src/lib/eo_lexer.rl" +#line 786 "eo_lexer.rl" { if (toknz->tmp.impl->legacy) ABORT(toknz, "Legacy section already allocated for implement item"); @@ -1604,7 +1604,7 @@ _eof_trans: } break; case 26: -#line 792 "/home/daniel/e17/eolian/src/lib/eo_lexer.rl" +#line 792 "eo_lexer.rl" { if (!toknz->tmp.impl->legacy) ABORT(toknz, "No legacy section"); @@ -1612,7 +1612,7 @@ _eof_trans: } break; case 27: -#line 798 "/home/daniel/e17/eolian/src/lib/eo_lexer.rl" +#line 798 "eo_lexer.rl" { toknz->tmp.impl_leg_param = calloc(1, sizeof(Eo_Implement_Legacy_Param_Def)); toknz->tmp.impl->legacy->params = eina_list_append( @@ -1622,19 +1622,19 @@ _eof_trans: } break; case 28: -#line 806 "/home/daniel/e17/eolian/src/lib/eo_lexer.rl" +#line 806 "eo_lexer.rl" { toknz->tmp.impl_leg_param->legacy_name = _eo_tokenizer_token_get(toknz, ( toknz->p)); } break; case 29: -#line 810 "/home/daniel/e17/eolian/src/lib/eo_lexer.rl" +#line 810 "eo_lexer.rl" { toknz->tmp.impl_leg_param->comment = _eo_tokenizer_token_get(toknz, ( toknz->p)-2); } break; case 30: -#line 814 "/home/daniel/e17/eolian/src/lib/eo_lexer.rl" +#line 814 "eo_lexer.rl" { if (!toknz->tmp.impl->legacy) ABORT(toknz, "No legacy section"); @@ -1642,7 +1642,7 @@ _eof_trans: } break; case 31: -#line 820 "/home/daniel/e17/eolian/src/lib/eo_lexer.rl" +#line 820 "eo_lexer.rl" { if (!toknz->tmp.impl->legacy) ABORT(toknz, "No legacy section"); @@ -1650,7 +1650,7 @@ _eof_trans: } break; case 32: -#line 895 "/home/daniel/e17/eolian/src/lib/eo_lexer.rl" +#line 895 "eo_lexer.rl" { if (toknz->tmp.kls != NULL) ABORT(toknz, "there is a pending class definition %s", toknz->tmp.kls->name); @@ -1658,7 +1658,7 @@ _eof_trans: } break; case 33: -#line 901 "/home/daniel/e17/eolian/src/lib/eo_lexer.rl" +#line 901 "eo_lexer.rl" { if (!toknz->tmp.kls) ABORT(toknz, "No pending class definition"); @@ -1670,7 +1670,7 @@ _eof_trans: { toknz->te = ( toknz->p)+1;} break; case 37: -#line 374 "/home/daniel/e17/eolian/src/lib/eo_lexer.rl" +#line 374 "eo_lexer.rl" { toknz->te = ( toknz->p)+1;{ if (toknz->tmp.accessor->comment != NULL) ABORT(toknz, "accessor has already a comment"); @@ -1679,32 +1679,32 @@ _eof_trans: }} break; case 38: -#line 313 "/home/daniel/e17/eolian/src/lib/eo_lexer.rl" +#line 313 "eo_lexer.rl" { toknz->te = ( toknz->p)+1;{ DBG("comment[%d] line%03d:%03d", toknz->cs, toknz->saved.line, toknz->current_line); }} break; case 39: -#line 430 "/home/daniel/e17/eolian/src/lib/eo_lexer.rl" +#line 430 "eo_lexer.rl" { toknz->te = ( toknz->p)+1;} break; case 40: -#line 431 "/home/daniel/e17/eolian/src/lib/eo_lexer.rl" +#line 431 "eo_lexer.rl" { toknz->te = ( toknz->p)+1;} break; case 41: -#line 399 "/home/daniel/e17/eolian/src/lib/eo_lexer.rl" +#line 399 "eo_lexer.rl" { toknz->te = ( toknz->p)+1;{ INF(" }"); toknz->tmp.prop->accessors = eina_list_append(toknz->tmp.prop->accessors, toknz->tmp.accessor); toknz->tmp.accessor = NULL; toknz->current_nesting--; - { toknz->cs = 342; goto _again;} + { toknz->cs = 341; goto _again;} }} break; case 42: -#line 322 "/home/daniel/e17/eolian/src/lib/eo_lexer.rl" +#line 322 "eo_lexer.rl" { toknz->te = ( toknz->p)+1;{ DBG("error[%d]", toknz->cs); char *s, *d; @@ -1723,15 +1723,15 @@ _eof_trans: }} break; case 43: -#line 426 "/home/daniel/e17/eolian/src/lib/eo_lexer.rl" +#line 426 "eo_lexer.rl" { toknz->te = ( toknz->p);( toknz->p)--;} break; case 44: -#line 429 "/home/daniel/e17/eolian/src/lib/eo_lexer.rl" +#line 429 "eo_lexer.rl" { toknz->te = ( toknz->p);( toknz->p)--;} break; case 45: -#line 322 "/home/daniel/e17/eolian/src/lib/eo_lexer.rl" +#line 322 "eo_lexer.rl" { toknz->te = ( toknz->p);( toknz->p)--;{ DBG("error[%d]", toknz->cs); char *s, *d; @@ -1750,11 +1750,11 @@ _eof_trans: }} break; case 46: -#line 429 "/home/daniel/e17/eolian/src/lib/eo_lexer.rl" +#line 429 "eo_lexer.rl" {{( toknz->p) = (( toknz->te))-1;}} break; case 47: -#line 322 "/home/daniel/e17/eolian/src/lib/eo_lexer.rl" +#line 322 "eo_lexer.rl" {{( toknz->p) = (( toknz->te))-1;}{ DBG("error[%d]", toknz->cs); char *s, *d; @@ -1773,28 +1773,28 @@ _eof_trans: }} break; case 48: -#line 313 "/home/daniel/e17/eolian/src/lib/eo_lexer.rl" +#line 313 "eo_lexer.rl" { toknz->te = ( toknz->p)+1;{ DBG("comment[%d] line%03d:%03d", toknz->cs, toknz->saved.line, toknz->current_line); }} break; case 49: -#line 457 "/home/daniel/e17/eolian/src/lib/eo_lexer.rl" +#line 457 "eo_lexer.rl" { toknz->te = ( toknz->p)+1;{ INF(" }"); toknz->tmp.param = NULL; toknz->current_nesting--; if (toknz->tmp.prop) - { toknz->cs = 342; goto _again;} + { toknz->cs = 341; goto _again;} else if (toknz->tmp.meth) - { toknz->cs = 354; goto _again;} + { toknz->cs = 353; goto _again;} else ABORT(toknz, "leaving tokenize_params but there is no property nor method pending"); }} break; case 50: -#line 322 "/home/daniel/e17/eolian/src/lib/eo_lexer.rl" +#line 322 "eo_lexer.rl" { toknz->te = ( toknz->p)+1;{ DBG("error[%d]", toknz->cs); char *s, *d; @@ -1813,15 +1813,15 @@ _eof_trans: }} break; case 51: -#line 473 "/home/daniel/e17/eolian/src/lib/eo_lexer.rl" +#line 473 "eo_lexer.rl" { toknz->te = ( toknz->p);( toknz->p)--;} break; case 52: -#line 475 "/home/daniel/e17/eolian/src/lib/eo_lexer.rl" +#line 475 "eo_lexer.rl" { toknz->te = ( toknz->p);( toknz->p)--;} break; case 53: -#line 322 "/home/daniel/e17/eolian/src/lib/eo_lexer.rl" +#line 322 "eo_lexer.rl" { toknz->te = ( toknz->p);( toknz->p)--;{ DBG("error[%d]", toknz->cs); char *s, *d; @@ -1840,11 +1840,11 @@ _eof_trans: }} break; case 54: -#line 475 "/home/daniel/e17/eolian/src/lib/eo_lexer.rl" +#line 475 "eo_lexer.rl" {{( toknz->p) = (( toknz->te))-1;}} break; case 55: -#line 322 "/home/daniel/e17/eolian/src/lib/eo_lexer.rl" +#line 322 "eo_lexer.rl" {{( toknz->p) = (( toknz->te))-1;}{ DBG("error[%d]", toknz->cs); char *s, *d; @@ -1863,40 +1863,40 @@ _eof_trans: }} break; case 56: -#line 313 "/home/daniel/e17/eolian/src/lib/eo_lexer.rl" +#line 313 "eo_lexer.rl" { toknz->te = ( toknz->p)+1;{ DBG("comment[%d] line%03d:%03d", toknz->cs, toknz->saved.line, toknz->current_line); }} break; case 57: -#line 482 "/home/daniel/e17/eolian/src/lib/eo_lexer.rl" +#line 482 "eo_lexer.rl" { toknz->te = ( toknz->p)+1;{ INF(" get {"); toknz->tmp.accessor = _eo_tokenizer_accessor_get(toknz, GETTER); toknz->current_nesting++; - { toknz->cs = 326; goto _again;} + { toknz->cs = 325; goto _again;} }} break; case 58: -#line 489 "/home/daniel/e17/eolian/src/lib/eo_lexer.rl" +#line 489 "eo_lexer.rl" { toknz->te = ( toknz->p)+1;{ INF(" set {"); toknz->tmp.accessor = _eo_tokenizer_accessor_get(toknz, SETTER); toknz->current_nesting++; - { toknz->cs = 326; goto _again;} + { toknz->cs = 325; goto _again;} }} break; case 59: -#line 496 "/home/daniel/e17/eolian/src/lib/eo_lexer.rl" +#line 496 "eo_lexer.rl" { toknz->te = ( toknz->p)+1;{ INF(" params {"); toknz->current_nesting++; - { toknz->cs = 335; goto _again;} + { toknz->cs = 334; goto _again;} }} break; case 60: -#line 502 "/home/daniel/e17/eolian/src/lib/eo_lexer.rl" +#line 502 "eo_lexer.rl" { toknz->te = ( toknz->p)+1;{ if (eina_list_count(toknz->tmp.prop->params) == 0) WRN("property '%s' has no parameters.", toknz->tmp.prop->name); @@ -1906,11 +1906,11 @@ _eof_trans: toknz->tmp.kls->properties = eina_list_append(toknz->tmp.kls->properties, toknz->tmp.prop); toknz->tmp.prop = NULL; toknz->current_nesting--; - { toknz->cs = 349; goto _again;} + { toknz->cs = 348; goto _again;} }} break; case 61: -#line 322 "/home/daniel/e17/eolian/src/lib/eo_lexer.rl" +#line 322 "eo_lexer.rl" { toknz->te = ( toknz->p)+1;{ DBG("error[%d]", toknz->cs); char *s, *d; @@ -1929,11 +1929,11 @@ _eof_trans: }} break; case 62: -#line 519 "/home/daniel/e17/eolian/src/lib/eo_lexer.rl" +#line 519 "eo_lexer.rl" { toknz->te = ( toknz->p);( toknz->p)--;} break; case 63: -#line 322 "/home/daniel/e17/eolian/src/lib/eo_lexer.rl" +#line 322 "eo_lexer.rl" { toknz->te = ( toknz->p);( toknz->p)--;{ DBG("error[%d]", toknz->cs); char *s, *d; @@ -1952,7 +1952,7 @@ _eof_trans: }} break; case 64: -#line 322 "/home/daniel/e17/eolian/src/lib/eo_lexer.rl" +#line 322 "eo_lexer.rl" {{( toknz->p) = (( toknz->te))-1;}{ DBG("error[%d]", toknz->cs); char *s, *d; @@ -1971,30 +1971,30 @@ _eof_trans: }} break; case 65: -#line 313 "/home/daniel/e17/eolian/src/lib/eo_lexer.rl" +#line 313 "eo_lexer.rl" { toknz->te = ( toknz->p)+1;{ DBG("comment[%d] line%03d:%03d", toknz->cs, toknz->saved.line, toknz->current_line); }} break; case 66: -#line 530 "/home/daniel/e17/eolian/src/lib/eo_lexer.rl" +#line 530 "eo_lexer.rl" { toknz->te = ( toknz->p)+1;{ INF(" %s {", toknz->tmp.prop->name); toknz->current_nesting++; - { toknz->cs = 342; goto _again;} + { toknz->cs = 341; goto _again;} }} break; case 67: -#line 542 "/home/daniel/e17/eolian/src/lib/eo_lexer.rl" +#line 542 "eo_lexer.rl" { toknz->te = ( toknz->p)+1;{ INF(" }"); toknz->current_nesting--; - { toknz->cs = 369; goto _again;} + { toknz->cs = 368; goto _again;} }} break; case 68: -#line 322 "/home/daniel/e17/eolian/src/lib/eo_lexer.rl" +#line 322 "eo_lexer.rl" { toknz->te = ( toknz->p)+1;{ DBG("error[%d]", toknz->cs); char *s, *d; @@ -2013,11 +2013,11 @@ _eof_trans: }} break; case 69: -#line 551 "/home/daniel/e17/eolian/src/lib/eo_lexer.rl" +#line 551 "eo_lexer.rl" { toknz->te = ( toknz->p);( toknz->p)--;} break; case 70: -#line 322 "/home/daniel/e17/eolian/src/lib/eo_lexer.rl" +#line 322 "eo_lexer.rl" { toknz->te = ( toknz->p);( toknz->p)--;{ DBG("error[%d]", toknz->cs); char *s, *d; @@ -2036,7 +2036,7 @@ _eof_trans: }} break; case 71: -#line 322 "/home/daniel/e17/eolian/src/lib/eo_lexer.rl" +#line 322 "eo_lexer.rl" {{( toknz->p) = (( toknz->te))-1;}{ DBG("error[%d]", toknz->cs); char *s, *d; @@ -2055,7 +2055,7 @@ _eof_trans: }} break; case 72: -#line 560 "/home/daniel/e17/eolian/src/lib/eo_lexer.rl" +#line 560 "eo_lexer.rl" { toknz->te = ( toknz->p)+1;{ if (toknz->tmp.meth->comment != NULL) ABORT(toknz, "method has already a comment"); @@ -2064,30 +2064,30 @@ _eof_trans: }} break; case 73: -#line 313 "/home/daniel/e17/eolian/src/lib/eo_lexer.rl" +#line 313 "eo_lexer.rl" { toknz->te = ( toknz->p)+1;{ DBG("comment[%d] line%03d:%03d", toknz->cs, toknz->saved.line, toknz->current_line); }} break; case 74: -#line 567 "/home/daniel/e17/eolian/src/lib/eo_lexer.rl" +#line 567 "eo_lexer.rl" { toknz->te = ( toknz->p)+1;{ INF(" params {"); toknz->current_nesting++; - { toknz->cs = 335; goto _again;} + { toknz->cs = 334; goto _again;} }} break; case 75: -#line 633 "/home/daniel/e17/eolian/src/lib/eo_lexer.rl" +#line 633 "eo_lexer.rl" { toknz->te = ( toknz->p)+1;} break; case 76: -#line 634 "/home/daniel/e17/eolian/src/lib/eo_lexer.rl" +#line 634 "eo_lexer.rl" { toknz->te = ( toknz->p)+1;} break; case 77: -#line 596 "/home/daniel/e17/eolian/src/lib/eo_lexer.rl" +#line 596 "eo_lexer.rl" { toknz->te = ( toknz->p)+1;{ Eina_List **l; if (eina_list_count(toknz->tmp.meth->params) == 0) @@ -2110,11 +2110,11 @@ _eof_trans: *l = eina_list_append(*l, toknz->tmp.meth); toknz->tmp.meth = NULL; toknz->current_nesting--; - { toknz->cs = 364; goto _again;} + { toknz->cs = 363; goto _again;} }} break; case 78: -#line 322 "/home/daniel/e17/eolian/src/lib/eo_lexer.rl" +#line 322 "eo_lexer.rl" { toknz->te = ( toknz->p)+1;{ DBG("error[%d]", toknz->cs); char *s, *d; @@ -2133,15 +2133,15 @@ _eof_trans: }} break; case 79: -#line 628 "/home/daniel/e17/eolian/src/lib/eo_lexer.rl" +#line 628 "eo_lexer.rl" { toknz->te = ( toknz->p);( toknz->p)--;} break; case 80: -#line 632 "/home/daniel/e17/eolian/src/lib/eo_lexer.rl" +#line 632 "eo_lexer.rl" { toknz->te = ( toknz->p);( toknz->p)--;} break; case 81: -#line 322 "/home/daniel/e17/eolian/src/lib/eo_lexer.rl" +#line 322 "eo_lexer.rl" { toknz->te = ( toknz->p);( toknz->p)--;{ DBG("error[%d]", toknz->cs); char *s, *d; @@ -2160,11 +2160,11 @@ _eof_trans: }} break; case 82: -#line 632 "/home/daniel/e17/eolian/src/lib/eo_lexer.rl" +#line 632 "eo_lexer.rl" {{( toknz->p) = (( toknz->te))-1;}} break; case 83: -#line 322 "/home/daniel/e17/eolian/src/lib/eo_lexer.rl" +#line 322 "eo_lexer.rl" {{( toknz->p) = (( toknz->te))-1;}{ DBG("error[%d]", toknz->cs); char *s, *d; @@ -2183,31 +2183,31 @@ _eof_trans: }} break; case 84: -#line 313 "/home/daniel/e17/eolian/src/lib/eo_lexer.rl" +#line 313 "eo_lexer.rl" { toknz->te = ( toknz->p)+1;{ DBG("comment[%d] line%03d:%03d", toknz->cs, toknz->saved.line, toknz->current_line); }} break; case 85: -#line 641 "/home/daniel/e17/eolian/src/lib/eo_lexer.rl" +#line 641 "eo_lexer.rl" { toknz->te = ( toknz->p)+1;{ INF(" %s {", toknz->tmp.meth->name); toknz->current_nesting++; - { toknz->cs = 354; goto _again;} + { toknz->cs = 353; goto _again;} }} break; case 86: -#line 653 "/home/daniel/e17/eolian/src/lib/eo_lexer.rl" +#line 653 "eo_lexer.rl" { toknz->te = ( toknz->p)+1;{ INF(" }"); toknz->current_methods_type = METH_TYPE_LAST; toknz->current_nesting--; - { toknz->cs = 369; goto _again;} + { toknz->cs = 368; goto _again;} }} break; case 87: -#line 322 "/home/daniel/e17/eolian/src/lib/eo_lexer.rl" +#line 322 "eo_lexer.rl" { toknz->te = ( toknz->p)+1;{ DBG("error[%d]", toknz->cs); char *s, *d; @@ -2226,11 +2226,11 @@ _eof_trans: }} break; case 88: -#line 663 "/home/daniel/e17/eolian/src/lib/eo_lexer.rl" +#line 663 "eo_lexer.rl" { toknz->te = ( toknz->p);( toknz->p)--;} break; case 89: -#line 322 "/home/daniel/e17/eolian/src/lib/eo_lexer.rl" +#line 322 "eo_lexer.rl" { toknz->te = ( toknz->p);( toknz->p)--;{ DBG("error[%d]", toknz->cs); char *s, *d; @@ -2249,7 +2249,7 @@ _eof_trans: }} break; case 90: -#line 322 "/home/daniel/e17/eolian/src/lib/eo_lexer.rl" +#line 322 "eo_lexer.rl" {{( toknz->p) = (( toknz->te))-1;}{ DBG("error[%d]", toknz->cs); char *s, *d; @@ -2268,7 +2268,7 @@ _eof_trans: }} break; case 91: -#line 672 "/home/daniel/e17/eolian/src/lib/eo_lexer.rl" +#line 672 "eo_lexer.rl" { toknz->te = ( toknz->p)+1;{ if (toknz->tmp.kls->comment != NULL) ABORT(toknz, "class %s has already a comment", toknz->tmp.kls->name); @@ -2276,76 +2276,76 @@ _eof_trans: }} break; case 92: -#line 313 "/home/daniel/e17/eolian/src/lib/eo_lexer.rl" +#line 313 "eo_lexer.rl" { toknz->te = ( toknz->p)+1;{ DBG("comment[%d] line%03d:%03d", toknz->cs, toknz->saved.line, toknz->current_line); }} break; case 93: -#line 683 "/home/daniel/e17/eolian/src/lib/eo_lexer.rl" +#line 683 "eo_lexer.rl" { toknz->te = ( toknz->p)+1;{ toknz->tmp.kls->inherits = toknz->tmp.str_items; toknz->tmp.str_items = NULL; }} break; case 94: -#line 688 "/home/daniel/e17/eolian/src/lib/eo_lexer.rl" +#line 688 "eo_lexer.rl" { toknz->te = ( toknz->p)+1;{ }} break; case 95: -#line 691 "/home/daniel/e17/eolian/src/lib/eo_lexer.rl" +#line 691 "eo_lexer.rl" { toknz->te = ( toknz->p)+1;{ }} break; case 96: -#line 694 "/home/daniel/e17/eolian/src/lib/eo_lexer.rl" +#line 694 "eo_lexer.rl" { toknz->te = ( toknz->p)+1;{ INF(" constructors {"); toknz->current_methods_type = METH_CONSTRUCTOR; toknz->current_nesting++; - { toknz->cs = 364; goto _again;} + { toknz->cs = 363; goto _again;} }} break; case 97: -#line 701 "/home/daniel/e17/eolian/src/lib/eo_lexer.rl" +#line 701 "eo_lexer.rl" { toknz->te = ( toknz->p)+1;{ INF(" destructors {"); toknz->current_methods_type = METH_DESTRUCTOR; toknz->current_nesting++; - { toknz->cs = 364; goto _again;} + { toknz->cs = 363; goto _again;} }} break; case 98: -#line 708 "/home/daniel/e17/eolian/src/lib/eo_lexer.rl" +#line 708 "eo_lexer.rl" { toknz->te = ( toknz->p)+1;{ INF(" properties {"); toknz->current_nesting++; - { toknz->cs = 349; goto _again;} + { toknz->cs = 348; goto _again;} }} break; case 99: -#line 714 "/home/daniel/e17/eolian/src/lib/eo_lexer.rl" +#line 714 "eo_lexer.rl" { toknz->te = ( toknz->p)+1;{ INF(" begin methods"); toknz->current_methods_type = METH_REGULAR; toknz->current_nesting++; - { toknz->cs = 364; goto _again;} + { toknz->cs = 363; goto _again;} }} break; case 100: -#line 721 "/home/daniel/e17/eolian/src/lib/eo_lexer.rl" +#line 721 "eo_lexer.rl" { toknz->te = ( toknz->p)+1;{ INF("end class: %s", toknz->tmp.kls->name); toknz->classes = eina_list_append(toknz->classes, toknz->tmp.kls); toknz->tmp.kls = NULL; toknz->current_nesting--; - { toknz->cs = 322; goto _again;} + { toknz->cs = 321; goto _again;} }} break; case 101: -#line 322 "/home/daniel/e17/eolian/src/lib/eo_lexer.rl" +#line 322 "eo_lexer.rl" { toknz->te = ( toknz->p)+1;{ DBG("error[%d]", toknz->cs); char *s, *d; @@ -2364,23 +2364,23 @@ _eof_trans: }} break; case 102: -#line 870 "/home/daniel/e17/eolian/src/lib/eo_lexer.rl" +#line 870 "eo_lexer.rl" { toknz->te = ( toknz->p);( toknz->p)--;} break; case 103: -#line 873 "/home/daniel/e17/eolian/src/lib/eo_lexer.rl" +#line 873 "eo_lexer.rl" { toknz->te = ( toknz->p);( toknz->p)--;} break; case 104: -#line 877 "/home/daniel/e17/eolian/src/lib/eo_lexer.rl" +#line 877 "eo_lexer.rl" { toknz->te = ( toknz->p);( toknz->p)--;} break; case 105: -#line 878 "/home/daniel/e17/eolian/src/lib/eo_lexer.rl" +#line 878 "eo_lexer.rl" { toknz->te = ( toknz->p);( toknz->p)--;} break; case 106: -#line 322 "/home/daniel/e17/eolian/src/lib/eo_lexer.rl" +#line 322 "eo_lexer.rl" { toknz->te = ( toknz->p);( toknz->p)--;{ DBG("error[%d]", toknz->cs); char *s, *d; @@ -2399,15 +2399,15 @@ _eof_trans: }} break; case 107: -#line 877 "/home/daniel/e17/eolian/src/lib/eo_lexer.rl" +#line 877 "eo_lexer.rl" {{( toknz->p) = (( toknz->te))-1;}} break; case 108: -#line 878 "/home/daniel/e17/eolian/src/lib/eo_lexer.rl" +#line 878 "eo_lexer.rl" {{( toknz->p) = (( toknz->te))-1;}} break; case 109: -#line 322 "/home/daniel/e17/eolian/src/lib/eo_lexer.rl" +#line 322 "eo_lexer.rl" {{( toknz->p) = (( toknz->te))-1;}{ DBG("error[%d]", toknz->cs); char *s, *d; @@ -2426,22 +2426,22 @@ _eof_trans: }} break; case 110: -#line 313 "/home/daniel/e17/eolian/src/lib/eo_lexer.rl" +#line 313 "eo_lexer.rl" { toknz->te = ( toknz->p)+1;{ DBG("comment[%d] line%03d:%03d", toknz->cs, toknz->saved.line, toknz->current_line); }} break; case 111: -#line 889 "/home/daniel/e17/eolian/src/lib/eo_lexer.rl" +#line 889 "eo_lexer.rl" { toknz->te = ( toknz->p)+1;{ INF("begin class: %s", toknz->tmp.kls->name); toknz->current_nesting++; - { toknz->cs = 369; goto _again;} + { toknz->cs = 368; goto _again;} }} break; case 112: -#line 322 "/home/daniel/e17/eolian/src/lib/eo_lexer.rl" +#line 322 "eo_lexer.rl" { toknz->te = ( toknz->p)+1;{ DBG("error[%d]", toknz->cs); char *s, *d; @@ -2460,11 +2460,11 @@ _eof_trans: }} break; case 113: -#line 912 "/home/daniel/e17/eolian/src/lib/eo_lexer.rl" +#line 912 "eo_lexer.rl" { toknz->te = ( toknz->p);( toknz->p)--;} break; case 114: -#line 322 "/home/daniel/e17/eolian/src/lib/eo_lexer.rl" +#line 322 "eo_lexer.rl" { toknz->te = ( toknz->p);( toknz->p)--;{ DBG("error[%d]", toknz->cs); char *s, *d; @@ -2483,7 +2483,7 @@ _eof_trans: }} break; case 115: -#line 322 "/home/daniel/e17/eolian/src/lib/eo_lexer.rl" +#line 322 "eo_lexer.rl" {{( toknz->p) = (( toknz->te))-1;}{ DBG("error[%d]", toknz->cs); char *s, *d; @@ -2532,12 +2532,12 @@ _again: _out: {} } -#line 966 "/home/daniel/e17/eolian/src/lib/eo_lexer.rl" +#line 966 "eo_lexer.rl" if ( toknz->cs == #line 2539 "eo_lexer.c" -1 -#line 967 "/home/daniel/e17/eolian/src/lib/eo_lexer.rl" +#line 967 "eo_lexer.rl" ) { ERR("wrong termination"); @@ -2608,7 +2608,7 @@ eo_tokenizer_dump(Eo_Tokenizer *toknz) Eo_Method_Def *meth; Eo_Param_Def *param; Eo_Accessor_Def *accessor; - Eo_Signal_Def *sgn; + Eo_Event_Def *sgn; /* Eo_Ret_Def *ret; */ EINA_LIST_FOREACH(toknz->classes, k, kls) @@ -2623,8 +2623,8 @@ eo_tokenizer_dump(Eo_Tokenizer *toknz) EINA_LIST_FOREACH(kls->implements, l, s) printf(" %s", s); printf("\n"); - printf(" signals:\n"); - EINA_LIST_FOREACH(kls->signals, l, sgn) + printf(" events:\n"); + EINA_LIST_FOREACH(kls->events, l, sgn) printf(" %s (%s)\n", sgn->name, sgn->comment); EINA_LIST_FOREACH(kls->constructors, l, meth) @@ -2699,7 +2699,7 @@ eo_tokenizer_database_fill(const char *filename) Eo_Method_Def *meth; Eo_Param_Def *param; Eo_Accessor_Def *accessor; - Eo_Signal_Def *signal; + Eo_Event_Def *event; Eo_Implement_Def *impl; /* Eo_Ret_Def *ret; */ @@ -2863,9 +2863,9 @@ eo_tokenizer_database_fill(const char *filename) database_class_implement_add(kls->name, impl_desc); } - EINA_LIST_FOREACH(kls->signals, l, signal) + EINA_LIST_FOREACH(kls->events, l, event) { - Eolian_Event ev = database_event_new(signal->name, signal->comment); + Eolian_Event ev = database_event_new(event->name, event->comment); database_class_event_add(kls->name, ev); } diff --git a/src/lib/eolian/eo_lexer.h b/src/lib/eolian/eo_lexer.h index 1932621880..56adb7e434 100644 --- a/src/lib/eolian/eo_lexer.h +++ b/src/lib/eolian/eo_lexer.h @@ -41,7 +41,7 @@ typedef struct _eo_tokenizer Eo_Accessor_Def *accessor; Eo_Accessor_Param *accessor_param; Eina_List *str_items; - Eo_Signal_Def *signal; + Eo_Event_Def *event; Eo_Implement_Def *impl; Eo_Implement_Legacy_Param_Def *impl_leg_param; } tmp; diff --git a/src/lib/eolian/eo_lexer.rl b/src/lib/eolian/eo_lexer.rl index 01554f8ba1..87f6db1c28 100644 --- a/src/lib/eolian/eo_lexer.rl +++ b/src/lib/eolian/eo_lexer.rl @@ -243,11 +243,11 @@ _eo_tokenizer_accessor_get(Eo_Tokenizer *toknz, Eo_Accessor_Type type) return accessor; } -static Eo_Signal_Def* -_eo_tokenizer_signal_get(Eo_Tokenizer *toknz, char *p) +static Eo_Event_Def* +_eo_tokenizer_event_get(Eo_Tokenizer *toknz, char *p) { - Eo_Signal_Def *sgn = calloc(1, sizeof(Eo_Signal_Def)); - if (sgn == NULL) ABORT(toknz, "calloc Eo_Signal_Def failure"); + Eo_Event_Def *sgn = calloc(1, sizeof(Eo_Event_Def)); + if (sgn == NULL) ABORT(toknz, "calloc Eo_Event_Def failure"); sgn->name = _eo_tokenizer_token_get(toknz, p); @@ -345,7 +345,7 @@ _eo_tokenizer_implement_get(Eo_Tokenizer *toknz, char *p) alnum_u = alnum | '_'; alpha_u = alpha | '_'; ident = alpha+ >save_fpc (alnum | '_' )+; - signal = alpha+ >save_fpc (alnum | '_' | ',' )+; + event = alpha+ >save_fpc (alnum | '_' | ',' )+; class_meth = alpha+ >save_fpc (alnum | '_' | '::' )+; eo_comment = "/*@" ignore* alnum_u >save_fpc ( any | cr @inc_line )* :>> "*/"; @@ -688,7 +688,7 @@ _eo_tokenizer_implement_get(Eo_Tokenizer *toknz, char *p) action end_implements { } - action end_signals { + action end_events { } action begin_constructors { @@ -726,16 +726,16 @@ _eo_tokenizer_implement_get(Eo_Tokenizer *toknz, char *p) fgoto main; } - action end_signal_name { - toknz->tmp.signal = _eo_tokenizer_signal_get(toknz, fpc); - toknz->tmp.kls->signals = eina_list_append(toknz->tmp.kls->signals, toknz->tmp.signal); + action end_event_name { + toknz->tmp.event = _eo_tokenizer_event_get(toknz, fpc); + toknz->tmp.kls->events = eina_list_append(toknz->tmp.kls->events, toknz->tmp.event); } - action end_signal_comment { - if (toknz->tmp.signal->comment != NULL) - ABORT(toknz, "signal %s has already a comment", toknz->tmp.signal->name); - toknz->tmp.signal->comment = _eo_tokenizer_token_get(toknz, fpc-2); - toknz->tmp.signal = NULL; + action end_event_comment { + if (toknz->tmp.event->comment != NULL) + ABORT(toknz, "event %s has already a comment", toknz->tmp.event->name); + toknz->tmp.event->comment = _eo_tokenizer_token_get(toknz, fpc-2); + toknz->tmp.event = NULL; } action end_dflt_ctor_def { @@ -851,9 +851,9 @@ _eo_tokenizer_implement_get(Eo_Tokenizer *toknz, char *p) # implements { ... } implements = 'implements' ignore* begin_def ignore* impl_it* end_def; - signal_comment = ws* eo_comment %end_signal_comment; - signal_it = signal %end_signal_name ignore* end_statement signal_comment? ignore*; - signals = 'signals' ignore* begin_def ignore* signal_it* end_def; + event_comment = ws* eo_comment %end_event_comment; + event_it = event %end_event_name ignore* end_statement event_comment? ignore*; + events = 'events' ignore* begin_def ignore* event_it* end_def; dflt_ctor_comment = ws* eo_comment %end_dflt_ctor_comment; dflt_ctor = 'constructor' >save_fpc %end_dflt_ctor_def ignore* end_statement dflt_ctor_comment? ignore*; @@ -873,7 +873,7 @@ _eo_tokenizer_implement_get(Eo_Tokenizer *toknz, char *p) legacy_prefix; inherits => end_inherits; implements => end_implements; - signals => end_signals; + events => end_events; dflt_ctor; dflt_dtor; constructors => begin_constructors; @@ -1034,7 +1034,7 @@ eo_tokenizer_dump(Eo_Tokenizer *toknz) Eo_Method_Def *meth; Eo_Param_Def *param; Eo_Accessor_Def *accessor; - Eo_Signal_Def *sgn; + Eo_Event_Def *sgn; /* Eo_Ret_Def *ret; */ EINA_LIST_FOREACH(toknz->classes, k, kls) @@ -1049,8 +1049,8 @@ eo_tokenizer_dump(Eo_Tokenizer *toknz) EINA_LIST_FOREACH(kls->implements, l, s) printf(" %s", s); printf("\n"); - printf(" signals:\n"); - EINA_LIST_FOREACH(kls->signals, l, sgn) + printf(" events:\n"); + EINA_LIST_FOREACH(kls->events, l, sgn) printf(" %s (%s)\n", sgn->name, sgn->comment); EINA_LIST_FOREACH(kls->constructors, l, meth) @@ -1125,7 +1125,7 @@ eo_tokenizer_database_fill(const char *filename) Eo_Method_Def *meth; Eo_Param_Def *param; Eo_Accessor_Def *accessor; - Eo_Signal_Def *signal; + Eo_Event_Def *event; Eo_Implement_Def *impl; /* Eo_Ret_Def *ret; */ @@ -1289,9 +1289,9 @@ eo_tokenizer_database_fill(const char *filename) database_class_implement_add(kls->name, impl_desc); } - EINA_LIST_FOREACH(kls->signals, l, signal) + EINA_LIST_FOREACH(kls->events, l, event) { - Eolian_Event ev = database_event_new(signal->name, signal->comment); + Eolian_Event ev = database_event_new(event->name, event->comment); database_class_event_add(kls->name, ev); }