Changeset 994e0b6 in tol

Timestamp:

Mar 3, 2009, 9:36:22 AM (18 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

1941-docker-image-to-test, devel, master

Children:

545d679

Parents:

3d1329c

Message:

Separating NameBlock father from current that is used for scope rules.
Themes related to father and full name are now solved in operator = (BEqualOperator::Evaluate)
New member cppFile_ and access methods to store source path for built-in functions

git-svn-id: ​https://www.tol-project.org/svn/tolp/trunk@682 be4846ae-f051-483a-831f-b64e7d08527f

File:

• tol/btol/bgrammar/tol_boper.h (modified) (6 diffs)

tol/btol/bgrammar/tol_boper.h

@@ -144 +144 @@
 
   BUserFunCode* uCode_;
+  BText cppFile_;
+
   void AddSystemOperator();
 
@@ -156 +158 @@
   void* GetProfiler()          { return(profiler_); }
   void  PutProfiler(void* prf) { profiler_=prf; }
+
+  const BText& CppFile() const;
+  void PutCppFile(const BText& cppFile);
 
   //! Gets operator's grammar
@@ -197 +202 @@
 {
 private:
-  static BText   creatingName_;
+  static BText creatingName_;
+  static BText currentFatherName_;
+  static bool  isCreatingNameBlock_;
+  static BText currentFullName_;
   static const BClass* creatingClass_;
 public:
@@ -211 +219 @@
   BSyntaxObject* Evaluate (const List*) ;
   static const BText&  CreatingName () { return(creatingName_); }
+  static const BText&  CurrentFatherName () { return(currentFatherName_); }
+  static const bool IsCreatingNameBlock () { return(isCreatingNameBlock_); }
+  static const BText&  CurrentFullName () { return(currentFullName_); }
   static const BClass* CreatingClass() { return(creatingClass_); }
   static void CleanCreating() { creatingName_=""; creatingClass_=NULL; }
@@ -528 +539 @@
 #define DefIntOpr(ORD, CLASS, NAME , MINARG, MAXARG, LISTARGS, DESC, CL)   \
   static void * clone##CLASS##Int##ORD () {                                \
-    return new BInternalOperator                                           \
-           IntOprConstructor(CLASS,NAME,MINARG,MAXARG,LISTARGS,DESC,CL);   \
+     BInternalOperator* opr = new BInternalOperator                            \
+           IntOprConstructor(CLASS,NAME,MINARG,MAXARG,LISTARGS,DESC,CL);         \
+     opr->PutCppFile(__FILE__);                                            \
+     return opr;                                                           \
   }                                                                        \
   static BInternalOperator* CLASS##Int##ORD  =                             \
@@ -579 +592 @@
 #  define DefExtOpr(ORD,CLASS,NAME,MINARG,MAXARG,LISTGRA,LISTARGS,DES,CL)  \
     static void * clone##CLASS##Ext##ORD () {                              \
-      return new BExternalOperator                                         \
+      BExternalOperator* opr = new BExternalOperator                         \
       ExtOprConstructor(CLASS,NAME,MINARG,MAXARG,LISTGRA,LISTARGS,DES,CL); \
+      opr->PutCppFile(__FILE__);                                           \
+      return opr;                                                          \
     }                                                                      \
     static BExternalOperator* CLASS##Ext##ORD  =                           \