--- parser3/src/include/pa_request.h 2016/11/03 16:17:37 1.239 +++ parser3/src/include/pa_request.h 2016/11/29 14:32:32 1.243 @@ -8,7 +8,7 @@ #ifndef PA_REQUEST_H #define PA_REQUEST_H -#define IDENT_PA_REQUEST_H "$Id: pa_request.h,v 1.239 2016/11/03 16:17:37 moko Exp $" +#define IDENT_PA_REQUEST_H "$Id: pa_request.h,v 1.243 2016/11/29 14:32:32 moko Exp $" #include "pa_pool.h" #include "pa_hash.h" @@ -123,7 +123,7 @@ private: Array file_list; /// endless execute(execute(... preventing counter - uint anti_endless_execute_recoursion; + int anti_endless_execute_recoursion; ///@} @@ -236,7 +236,9 @@ public: /// compiles the file, maybe forcing it's class @a name and @a base_class. void use_file(VStateless_class& aclass, const String& file_name, const String* use_filespec); - void use_file(VStateless_class& aclass, const String& file_name, const String* use_filespec, Operation::Origin origin); + + /// for @USE only, calls ^use (which may be user-defined) + void use_file(const String& file_name, const String* use_filespec, Operation::Origin origin); /// compiles a @a source buffer void use_buf(VStateless_class& aclass, const char* source, const String* main_alias, uint file_no, int line_no_offset=0); @@ -251,8 +253,8 @@ public: return process(input_value).as_string(); } //@} - const String* get_method_filename(const Method* method); // execute.C - const String* get_used_filename(uint file_no); + const String* get_method_filespec(const Method* method); // execute.C + const String* get_used_filespec(uint file_no); /// appending string with it's languages inline void write(const String& astring) { @@ -260,7 +262,7 @@ public: } /// in [] and {} appending string if get_string is not null, else appending value - /// in () allways appending value + /// in () appending string if is_string, else appending value inline void write(Value& avalue) { wcontext->write_as_string(avalue); }