From 4a715f8ea84e6468d156ef8b013b1847217a7dbf Mon Sep 17 00:00:00 2001 From: paladin-t Date: Thu, 18 Feb 2016 11:07:04 +0800 Subject: [PATCH] +added a generic iterator type. --- HISTORY | 3 +++ core/my_basic.c | 3 +++ core/my_basic.h | 1 + shell/main.c | 4 +++- 4 files changed, 10 insertions(+), 1 deletion(-) diff --git a/HISTORY b/HISTORY index c0cc476..7bbf171 100755 --- a/HISTORY +++ b/HISTORY @@ -1,3 +1,6 @@ +Feb. 18 2016 +Added a generic iterator type + Feb. 16 2016 Fixed a bug of the EXIT statement with FOR loop diff --git a/core/my_basic.c b/core/my_basic.c index c1c645f..2f981fa 100755 --- a/core/my_basic.c +++ b/core/my_basic.c @@ -11334,6 +11334,8 @@ const char* mb_get_type_string(mb_data_e t) { return "DICT_ITERATOR"; case MB_DT_COLLECTION: return "COLLECTION"; + case MB_DT_ITERATOR: + return "ITERATOR"; #endif /* MB_ENABLE_COLLECTION_LIB */ #ifdef MB_ENABLE_CLASS case MB_DT_CLASS: @@ -13425,6 +13427,7 @@ static int _core_type(mb_interpreter_t* s, void** l) { MB_DT_DICT, MB_DT_DICT_IT, MB_DT_COLLECTION, + MB_DT_ITERATOR, #endif /* MB_ENABLE_COLLECTION_LIB */ #ifdef MB_ENABLE_CLASS MB_DT_CLASS, diff --git a/core/my_basic.h b/core/my_basic.h index 45404d5..3560249 100755 --- a/core/my_basic.h +++ b/core/my_basic.h @@ -372,6 +372,7 @@ typedef enum mb_data_e { MB_DT_DICT = 1 << 10, MB_DT_DICT_IT = 1 << 11, MB_DT_COLLECTION = MB_DT_LIST | MB_DT_DICT, + MB_DT_ITERATOR = MB_DT_LIST_IT | MB_DT_DICT_IT, #endif /* MB_ENABLE_COLLECTION_LIB */ #ifdef MB_ENABLE_CLASS MB_DT_CLASS = 1 << 12, diff --git a/shell/main.c b/shell/main.c index 3fdee60..5eb4946 100755 --- a/shell/main.c +++ b/shell/main.c @@ -1087,7 +1087,9 @@ static int_t _ticks(void) { static int_t _ticks(void) { struct timespec ts; struct timeval now; - int rv = gettimeofday(&now, NULL); + int rv = 0; + + rv = gettimeofday(&now, 0); if(rv) return 0; ts.tv_sec = now.tv_sec; ts.tv_nsec = now.tv_usec * 1000;