diff options
author | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2015-08-26 10:32:52 +0200 |
---|---|---|
committer | Anders Broman <a.broman58@gmail.com> | 2015-08-27 04:35:23 +0000 |
commit | 2e1fa634c60b8a6af19be57c6a334c564692c986 (patch) | |
tree | cca48fcdc81befe715f07689b7961526656918c0 | |
parent | 0af048b7e40ee92d6702df873cbc515ae2eff9c8 (diff) |
Lemon grammar: fix indent (use tabs)
Change-Id: I6fa38d5d85b25ac6c55fcfa67d6c8dba8482cc8c
Reviewed-on: https://code.wireshark.org/review/10266
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
-rw-r--r-- | epan/dfilter/grammar.lemon | 16 | ||||
-rw-r--r-- | epan/dtd_grammar.lemon | 98 | ||||
-rw-r--r-- | plugins/mate/mate_grammar.lemon | 130 |
3 files changed, 122 insertions, 122 deletions
diff --git a/epan/dfilter/grammar.lemon b/epan/dfilter/grammar.lemon index abd6e9a1cd..872a0d61c7 100644 --- a/epan/dfilter/grammar.lemon +++ b/epan/dfilter/grammar.lemon @@ -16,7 +16,7 @@ #ifdef _WIN32 #pragma warning(disable:4671) #endif - + /* End of C code */ } @@ -73,7 +73,7 @@ any "error" symbols are shifted, if possible. */ } switch(stnode_type_id(TOKEN)) { - case STTYPE_UNINITIALIZED: + case STTYPE_UNINITIALIZED: dfilter_fail(dfw, "Syntax error."); break; case STTYPE_TEST: @@ -127,8 +127,8 @@ shifting 3 more symbols. */ %right TEST_NOT. /* Top-level targets */ -sentence ::= expr(X). { dfw->st_root = X; } -sentence ::= . { dfw->st_root = NULL; } +sentence ::= expr(X). { dfw->st_root = X; } +sentence ::= . { dfw->st_root = NULL; } expr(X) ::= relation_test(R). { X = R; } expr(X) ::= logical_test(L). { X = L; } @@ -198,7 +198,7 @@ drnode(D) ::= INTEGER(X) COLON INTEGER(Y). D = drange_node_new(); drange_node_set_start_offset(D, stnode_value(X)); drange_node_set_length(D, stnode_value(Y)); - + stnode_free(X); stnode_free(Y); } @@ -209,7 +209,7 @@ drnode(D) ::= INTEGER(X) HYPHEN INTEGER(Y). D = drange_node_new(); drange_node_set_start_offset(D, stnode_value(X)); drange_node_set_end_offset(D, stnode_value(Y)); - + stnode_free(X); stnode_free(Y); } @@ -291,14 +291,14 @@ rel_op2(O) ::= TEST_MATCHES. { O = TEST_OP_MATCHES; } /* A function can have one or more parameters */ entity(E) ::= FUNCTION(F) LPAREN funcparams(P) RPAREN. { - E = F; + E = F; sttype_function_set_params(E, P); } /* A function can have zero parameters. */ entity(E) ::= FUNCTION(F) LPAREN RPAREN. { - E = F; + E = F; } funcparams(P) ::= entity(E). diff --git a/epan/dtd_grammar.lemon b/epan/dtd_grammar.lemon index 8f2755072c..9010bf96a0 100644 --- a/epan/dtd_grammar.lemon +++ b/epan/dtd_grammar.lemon @@ -38,16 +38,16 @@ static dtd_named_list_t* dtd_named_list_new(gchar* name, GPtrArray* list) { nl->name = name; nl->list = list; - + return nl; } static GPtrArray* g_ptr_array_join(GPtrArray* a, GPtrArray* b){ - + while(b->len > 0) { g_ptr_array_add(a,g_ptr_array_remove_index_fast(b,0)); } - + g_ptr_array_free(b,TRUE); return a; @@ -87,36 +87,36 @@ dtd ::= doctype. dtd ::= dtd_parts. doctype ::= TAG_START DOCTYPE_KW NAME(Name) OPEN_BRACKET dtd_parts CLOSE_BRACKET TAG_STOP. { - dtd_named_list_t* root; - GPtrArray* root_elems = g_ptr_array_new(); - guint i; - gchar *name; + dtd_named_list_t* root; + GPtrArray* root_elems = g_ptr_array_new(); + guint i; + gchar *name; - if(! bd->proto_name) { - bd->proto_name = Name->text; - } + if(! bd->proto_name) { + bd->proto_name = Name->text; + } - if(bd->proto_root) - g_free(bd->proto_root); + if(bd->proto_root) + g_free(bd->proto_root); bd->proto_root = Name->text; - - name = g_ascii_strdown(bd->proto_name, -1); - g_free(bd->proto_name); + + name = g_ascii_strdown(bd->proto_name, -1); + g_free(bd->proto_name); bd->proto_name = name; - - for( i = 0; i< bd->elements->len; i++) { - dtd_named_list_t* el = (dtd_named_list_t*)g_ptr_array_index(bd->elements,i); - - g_ptr_array_add(root_elems,g_strdup(el->name)); - } - - root = dtd_named_list_new(g_strdup(Name->text),root_elems); - - g_ptr_array_add(bd->elements,root); - - g_free(Name->location); - g_free(Name); + + for( i = 0; i< bd->elements->len; i++) { + dtd_named_list_t* el = (dtd_named_list_t*)g_ptr_array_index(bd->elements,i); + + g_ptr_array_add(root_elems,g_strdup(el->name)); + } + + root = dtd_named_list_new(g_strdup(Name->text),root_elems); + + g_ptr_array_add(bd->elements,root); + + g_free(Name->location); + g_free(Name); } @@ -127,18 +127,18 @@ dtd_parts ::= attlist(Attlist). { g_ptr_array_add(bd->attributes,Attlist); } %type attlist { dtd_named_list_t* } attlist(A) ::= TAG_START ATTLIST_KW NAME(B) attrib_list(TheList) TAG_STOP. { - A = dtd_named_list_new(g_ascii_strdown(B->text, -1),TheList); - g_free(B->text); - g_free(B->location); - g_free(B); + A = dtd_named_list_new(g_ascii_strdown(B->text, -1),TheList); + g_free(B->text); + g_free(B->location); + g_free(B); } %type element { dtd_named_list_t* } element(A) ::= TAG_START ELEMENT_KW NAME(B) sub_elements(C) TAG_STOP. { - A = dtd_named_list_new(g_ascii_strdown(B->text, -1),C); - g_free(B->text); - g_free(B->location); - g_free(B); + A = dtd_named_list_new(g_ascii_strdown(B->text, -1),C); + g_free(B->text); + g_free(B->location); + g_free(B); } %type attrib_list { GPtrArray* } @@ -148,9 +148,9 @@ attrib_list(A) ::= attrib(B). { A = g_ptr_array_new(); g_ptr_array_add(A,B); } %type attrib { gchar* } attrib(A) ::= NAME(B) att_type att_default. { A = g_ascii_strdown(B->text, -1); - g_free(B->text); - g_free(B->location); - g_free(B); + g_free(B->text); + g_free(B->location); + g_free(B); } att_type ::= ATT_TYPE. @@ -188,35 +188,35 @@ element_list(A) ::= element_list(B) COMMA element_child(C). { g_ptr_array_add(B, element_list(A) ::= element_list(B) PIPE element_child(C). { g_ptr_array_add(B,C); A = B; } element_list(A) ::= element_child(B). { A = g_ptr_array_new(); g_ptr_array_add(A,B); } element_list(A) ::= sub_elements(B). { A = B; } -element_list(A) ::= element_list(B) COMMA sub_elements(C). { A = g_ptr_array_join(B,C); } -element_list(A) ::= element_list(B) PIPE sub_elements(C). { A = g_ptr_array_join(B,C); } +element_list(A) ::= element_list(B) COMMA sub_elements(C). { A = g_ptr_array_join(B,C); } +element_list(A) ::= element_list(B) PIPE sub_elements(C). { A = g_ptr_array_join(B,C); } %type element_child { gchar* } element_child(A) ::= NAME(B). { A = g_ascii_strdown(B->text, -1); g_free(B->text); - g_free(B->location); - g_free(B); + g_free(B->location); + g_free(B); } element_child(A) ::= NAME(B) STAR. { A = g_ascii_strdown(B->text, -1); g_free(B->text); - g_free(B->location); - g_free(B); + g_free(B->location); + g_free(B); } element_child(A) ::= NAME(B) QUESTION. { A = g_ascii_strdown(B->text, -1); g_free(B->text); - g_free(B->location); - g_free(B); + g_free(B->location); + g_free(B); } element_child(A) ::= NAME(B) PLUS. { A = g_ascii_strdown(B->text, -1); g_free(B->text); - g_free(B->location); - g_free(B); + g_free(B->location); + g_free(B); } diff --git a/plugins/mate/mate_grammar.lemon b/plugins/mate/mate_grammar.lemon index 83e280edbc..4af20fbd79 100644 --- a/plugins/mate/mate_grammar.lemon +++ b/plugins/mate/mate_grammar.lemon @@ -64,13 +64,13 @@ typedef struct _gog_statements { } gog_statement_t; typedef struct _transf_match_t { - avpl_match_mode match_mode; - AVPL* avpl; + avpl_match_mode match_mode; + AVPL* avpl; } transf_match_t; typedef struct _transf_action_t { - avpl_replace_mode replace_mode; - AVPL* avpl; + avpl_replace_mode replace_mode; + AVPL* avpl; } transf_action_t; static void configuration_error(mate_config* mc, const gchar* fmt, ...) { @@ -135,7 +135,7 @@ static gchar* recolonize(mate_config* mc, gchar* s) { v = 0; switch ( strlen(vec[i]) ) { case 2: - c = vec[i][1]; + c = vec[i][1]; vec[i][1] = vec[i][0]; vec[i][0] = c; if (vec[i][0] >= '0' && vec[i][0] <= '9') { @@ -354,7 +354,7 @@ transform_decl(A) ::= TRANSFORM_KW NAME(B) transform_body(C) SEMICOLON. { transform_body(A) ::= OPEN_BRACE transform_statements(B) CLOSE_BRACE. { A = B; } transform_statements(A) ::= transform_statements(C) transform_statement(B). { - AVPL_Transf* c; + AVPL_Transf* c; for ( c = C; c->next; c = c->next ) ; c->next = B; @@ -368,27 +368,27 @@ transform_statement(A) ::= transform_match(Match) transform_action(Action) SEMIC } transform_match(A) ::= MATCH_KW match_mode(Mode) avpl(Avpl). { - A = (transf_match_t *)g_malloc(sizeof(transf_match_t)); - A->match_mode = Mode; - A->avpl = Avpl; + A = (transf_match_t *)g_malloc(sizeof(transf_match_t)); + A->match_mode = Mode; + A->avpl = Avpl; } transform_match(A) ::= . { - A = (transf_match_t *)g_malloc(sizeof(transf_match_t)); - A->match_mode = AVPL_STRICT; - A->avpl = new_avpl(""); + A = (transf_match_t *)g_malloc(sizeof(transf_match_t)); + A->match_mode = AVPL_STRICT; + A->avpl = new_avpl(""); } transform_action(A) ::= . { - A = (transf_action_t *)g_malloc(sizeof(transf_action_t)); - A->replace_mode = AVPL_INSERT; - A->avpl = new_avpl(""); + A = (transf_action_t *)g_malloc(sizeof(transf_action_t)); + A->replace_mode = AVPL_INSERT; + A->avpl = new_avpl(""); } transform_action(A) ::= action_mode(Mode) avpl(Avpl). { - A = (transf_action_t *)g_malloc(sizeof(transf_action_t)); - A->replace_mode = Mode; - A->avpl = Avpl; + A = (transf_action_t *)g_malloc(sizeof(transf_action_t)); + A->replace_mode = Mode; + A->avpl = Avpl; } match_mode(A) ::= . { A = AVPL_STRICT; } @@ -404,16 +404,16 @@ action_mode(A) ::= . { A = AVPL_INSERT; } */ pdu_decl ::= - PDU_KW NAME(Name) PROTO_KW field(Field) TRANSPORT_KW proto_stack(Stack) - OPEN_BRACE - payload_statement(Payload) - extraction_statements(Extraction) - transform_list_statement(Transform) - criteria_statement(Criteria) - pdu_drop_unassigned_statement(DropUnassigned) - discard_pdu_data_statement(DistcardPduData) - last_extracted_statement(LastExtracted) - CLOSE_BRACE SEMICOLON. + PDU_KW NAME(Name) PROTO_KW field(Field) TRANSPORT_KW proto_stack(Stack) + OPEN_BRACE + payload_statement(Payload) + extraction_statements(Extraction) + transform_list_statement(Transform) + criteria_statement(Criteria) + pdu_drop_unassigned_statement(DropUnassigned) + discard_pdu_data_statement(DistcardPduData) + last_extracted_statement(LastExtracted) + CLOSE_BRACE SEMICOLON. { mate_cfg_pdu* cfg = new_pducfg(Name); @@ -523,18 +523,18 @@ field(A) ::= NAME(B). { */ gop_decl(A) ::= GOP_KW NAME(Name) ON_KW pdu_name(PduName) MATCH_KW avpl(Key) OPEN_BRACE - gop_start_statement(Start) - gop_stop_statement(Stop) - extra_statement(Extra) - transform_list_statement(Transform) - gop_expiration_statement(Expiration) - idle_timeout_statement(IdleTimeout) - lifetime_statement(Lifetime) - gop_drop_unassigned_statement(DropUnassigned) - show_goptree_statement(TreeMode) - show_times_statement(ShowTimes) - CLOSE_BRACE SEMICOLON. { - mate_cfg_gop* cfg; + gop_start_statement(Start) + gop_stop_statement(Stop) + extra_statement(Extra) + transform_list_statement(Transform) + gop_expiration_statement(Expiration) + idle_timeout_statement(IdleTimeout) + lifetime_statement(Lifetime) + gop_drop_unassigned_statement(DropUnassigned) + show_goptree_statement(TreeMode) + show_times_statement(ShowTimes) + CLOSE_BRACE SEMICOLON. { + mate_cfg_gop* cfg; if (g_hash_table_lookup(mc->gopcfgs,Name)) configuration_error(mc,"A Gop Named '%s' exists already.",Name); if (g_hash_table_lookup(mc->gops_by_pduname,PduName) ) configuration_error(mc,"Gop for Pdu '%s' exists already",PduName); @@ -557,7 +557,7 @@ gop_decl(A) ::= GOP_KW NAME(Name) ON_KW pdu_name(PduName) MATCH_KW avpl(Key) OPE merge_avpl(cfg->extra,Extra,TRUE); delete_avpl(Extra,TRUE); - } +} gop_drop_unassigned_statement(A) ::= DROP_UNASSIGNED_KW true_false(B) SEMICOLON. { A = B; } gop_drop_unassigned_statement(A) ::= . { A = mc->defaults.gop.drop_unassigned; } @@ -583,10 +583,10 @@ idle_timeout_statement(A) ::= . { A = mc->defaults.gop.lifetime; } lifetime_statement(A) ::= LIFETIME_KW time_value(B) SEMICOLON. { A = B; } lifetime_statement(A) ::= . { A = mc->defaults.gop.lifetime; } -gop_tree_mode(A) ::= NO_TREE_KW. { A = (gop_tree_mode_t)GOP_NO_TREE; } -gop_tree_mode(A) ::= PDU_TREE_KW. { A = (gop_tree_mode_t)GOP_PDU_TREE; } -gop_tree_mode(A) ::= FRAME_TREE_KW. { A = (gop_tree_mode_t)GOP_FRAME_TREE; } -gop_tree_mode(A) ::= BASIC_TREE_KW. { A = (gop_tree_mode_t)GOP_BASIC_PDU_TREE; } +gop_tree_mode(A) ::= NO_TREE_KW. { A = (gop_tree_mode_t)GOP_NO_TREE; } +gop_tree_mode(A) ::= PDU_TREE_KW. { A = (gop_tree_mode_t)GOP_PDU_TREE; } +gop_tree_mode(A) ::= FRAME_TREE_KW. { A = (gop_tree_mode_t)GOP_FRAME_TREE; } +gop_tree_mode(A) ::= BASIC_TREE_KW. { A = (gop_tree_mode_t)GOP_BASIC_PDU_TREE; } true_false(A) ::= TRUE_KW. { A = TRUE; } true_false(A) ::= FALSE_KW. { A = FALSE; } @@ -613,29 +613,29 @@ time_value(A) ::= INTEGER(B). { */ gog_decl ::= GOG_KW NAME(Name) OPEN_BRACE - gog_key_statements(Keys) - extra_statement(Extra) - transform_list_statement(Transforms) - gog_expiration_statement(Expiration) - gog_goptree_statement(Tree) - show_times_statement(ShowTimes) - CLOSE_BRACE SEMICOLON. { - mate_cfg_gog* cfg = NULL; - - if ( g_hash_table_lookup(mc->gogcfgs,Name) ) { - configuration_error(mc,"Gog '%s' exists already ",Name); - } + gog_key_statements(Keys) + extra_statement(Extra) + transform_list_statement(Transforms) + gog_expiration_statement(Expiration) + gog_goptree_statement(Tree) + show_times_statement(ShowTimes) + CLOSE_BRACE SEMICOLON. { + mate_cfg_gog* cfg = NULL; + + if ( g_hash_table_lookup(mc->gogcfgs,Name) ) { + configuration_error(mc,"Gog '%s' exists already ",Name); + } - cfg = new_gogcfg(Name); + cfg = new_gogcfg(Name); - cfg->expiration = Expiration; - cfg->gop_tree_mode = Tree; - cfg->transforms = Transforms; - cfg->keys = Keys; - cfg->show_times = ShowTimes; + cfg->expiration = Expiration; + cfg->gop_tree_mode = Tree; + cfg->transforms = Transforms; + cfg->keys = Keys; + cfg->show_times = ShowTimes; - merge_avpl(cfg->extra,Extra,TRUE); - delete_avpl(Extra,TRUE); + merge_avpl(cfg->extra,Extra,TRUE); + delete_avpl(Extra,TRUE); } gog_goptree_statement(A) ::= GOP_TREE_KW gop_tree_type(B) SEMICOLON. { A = B; } |