summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Kolesa <d.kolesa@osg.samsung.com>2018-01-31 18:10:06 +0100
committerDaniel Kolesa <d.kolesa@osg.samsung.com>2018-01-31 18:13:29 +0100
commitf0877c9329248624c44d2cca113e737ee7f1ba50 (patch)
treebb3c12b4b37f66428c6984b645e197f5ca9280f3
parentb5794afa580e1aa40222544abeb8dcd3239a5af7 (diff)
eolian: no need to track currently parsing file anymore
-rw-r--r--src/lib/eolian/eo_parser.c4
-rw-r--r--src/lib/eolian/eolian_database.c6
-rw-r--r--src/lib/eolian/eolian_database.h1
3 files changed, 2 insertions, 9 deletions
diff --git a/src/lib/eolian/eo_parser.c b/src/lib/eolian/eo_parser.c
index 3441ad4b84..5a6938b606 100644
--- a/src/lib/eolian/eo_parser.c
+++ b/src/lib/eolian/eo_parser.c
@@ -2264,8 +2264,6 @@ eo_parser_database_fill(Eolian_Unit *parent, const char *filename, Eina_Bool eot
2264 return NULL; 2264 return NULL;
2265 } 2265 }
2266 2266
2267 eina_hash_set(parent->state->parsing, filename, (void *)EINA_TRUE);
2268
2269 Eo_Lexer *ls = eo_lexer_new(parent->state, filename); 2267 Eo_Lexer *ls = eo_lexer_new(parent->state, filename);
2270 if (!ls) 2268 if (!ls)
2271 { 2269 {
@@ -2298,14 +2296,12 @@ eo_parser_database_fill(Eolian_Unit *parent, const char *filename, Eina_Bool eot
2298done: 2296done:
2299 ret = ls->unit; 2297 ret = ls->unit;
2300 eina_hash_set(ls->state->parsed, filename, eot ? (void *)EINA_TRUE : cl); 2298 eina_hash_set(ls->state->parsed, filename, eot ? (void *)EINA_TRUE : cl);
2301 eina_hash_set(ls->state->parsing, filename, (void *)EINA_FALSE);
2302 eina_hash_add(parent->children, filename, ret); 2299 eina_hash_add(parent->children, filename, ret);
2303 2300
2304 eo_lexer_free(ls); 2301 eo_lexer_free(ls);
2305 return ret; 2302 return ret;
2306 2303
2307error: 2304error:
2308 eina_hash_set(ls->state->parsing, filename, (void *)EINA_FALSE);
2309 eo_lexer_free(ls); 2305 eo_lexer_free(ls);
2310 return NULL; 2306 return NULL;
2311} 2307}
diff --git a/src/lib/eolian/eolian_database.c b/src/lib/eolian/eolian_database.c
index 8b82503e7e..49dbe73853 100644
--- a/src/lib/eolian/eolian_database.c
+++ b/src/lib/eolian/eolian_database.c
@@ -550,9 +550,8 @@ eolian_new(void)
550 state->filenames_eo = eina_hash_string_small_new(free); 550 state->filenames_eo = eina_hash_string_small_new(free);
551 state->filenames_eot = eina_hash_string_small_new(free); 551 state->filenames_eot = eina_hash_string_small_new(free);
552 552
553 state->parsed = eina_hash_string_small_new(NULL); 553 state->parsed = eina_hash_string_small_new(NULL);
554 state->parsing = eina_hash_string_small_new(NULL); 554 state->defer = eina_hash_string_small_new(NULL);
555 state->defer = eina_hash_string_small_new(NULL);
556 555
557 state->units = eina_hash_stringshared_new(EINA_FREE_CB(database_unit_del)); 556 state->units = eina_hash_stringshared_new(EINA_FREE_CB(database_unit_del));
558 557
@@ -579,7 +578,6 @@ eolian_free(Eolian *state)
579 eina_hash_free(state->filenames_eot); 578 eina_hash_free(state->filenames_eot);
580 579
581 eina_hash_free(state->parsed); 580 eina_hash_free(state->parsed);
582 eina_hash_free(state->parsing);
583 eina_hash_free(state->defer); 581 eina_hash_free(state->defer);
584 582
585 eina_hash_free(state->units); 583 eina_hash_free(state->units);
diff --git a/src/lib/eolian/eolian_database.h b/src/lib/eolian/eolian_database.h
index 69bd5630ac..a26b4af560 100644
--- a/src/lib/eolian/eolian_database.h
+++ b/src/lib/eolian/eolian_database.h
@@ -51,7 +51,6 @@ struct _Eolian
51 Eina_Hash *filenames_eo; /* filename to full path mapping */ 51 Eina_Hash *filenames_eo; /* filename to full path mapping */
52 Eina_Hash *filenames_eot; 52 Eina_Hash *filenames_eot;
53 53
54 Eina_Hash *parsing;
55 Eina_Hash *parsed; 54 Eina_Hash *parsed;
56 Eina_Hash *defer; 55 Eina_Hash *defer;
57 56