X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=nucleus%2Flibrary%2Fstructures%2Fsymbol_table.h;fp=nucleus%2Flibrary%2Fstructures%2Fsymbol_table.h;h=ab7e562b3ffd88192a64f50c4468f6bd0e695df6;hb=7b39f7e279005c8466ef508220a532ce2aa4abf8;hp=ee4bc2462efd554a71f5220010af7a8c2d7cb006;hpb=3fbd372b35b15a19fb171d5ae34294ff7b1e6485;p=feisty_meow.git diff --git a/nucleus/library/structures/symbol_table.h b/nucleus/library/structures/symbol_table.h index ee4bc246..ab7e562b 100644 --- a/nucleus/library/structures/symbol_table.h +++ b/nucleus/library/structures/symbol_table.h @@ -83,7 +83,7 @@ public: //!< named equivalent for the bracket operator. contents *find(const basis::astring &name) const; - //!< returns the contents held for "name" or NIL if it wasn't found. + //!< returns the contents held for "name" or NULL_POINTER if it wasn't found. contents *find(const basis::astring &name, basis::string_comparator_function *comparator) const; @@ -119,7 +119,7 @@ private: internal_symbol_indexer *_tracker; //!< indexed lookup support. internal_symbol_info *get_index(int index) const; - //!< returns the info item at "index" or NIL. + //!< returns the info item at "index" or NULL_POINTER. }; ////////////// @@ -287,7 +287,7 @@ template internal_symbol_info *symbol_table:: get_index(int index) const { - bounds_return(index, 0, symbols() - 1, NIL); + bounds_return(index, 0, symbols() - 1, NULL_POINTER); return _tracker->find(_tracker->ids()[index])->_held; } @@ -314,7 +314,7 @@ contents *symbol_table::find(const basis::astring &name) const { // FUNCDEF("find [name]"); internal_symbol_info *found = _symbol_list->find(name); - if (!found) return NIL; + if (!found) return NULL_POINTER; return &found->_content; } @@ -337,7 +337,7 @@ struct sym_tab_apply_data contents *_found; basis::astring _to_find; - sym_tab_apply_data() : _scf(NIL), _found(NIL) {} + sym_tab_apply_data() : _scf(NULL_POINTER), _found(NULL_POINTER) {} }; template