Changeset b2fecec in tol

Timestamp:

Aug 28, 2015, 11:03:05 PM (11 years ago)

Author:

Jorge Pérez <josp.jorge@…>

Branches:

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

Children:

565716a

Parents:

8e9626b

Message:

refs #1661, #1866, se corrigen errores sintacticos relacionados con la carga de ozas

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

Location:

tol

Files:

• CMakeLists.txt (modified) (1 diff)
• OIS/oisloader.cpp (modified) (3 diffs)
• bparser/tol_btoken.h (modified) (1 diff)
• btol/bgrammar/oprimp.cpp (modified) (1 diff)
• btol/matrix_type/tol_mat.hpp (modified) (1 diff)
• btol/matrix_type/tol_matgen.hpp (modified) (1 diff)

tol/CMakeLists.txt

@@ -73 +73 @@
   message( STATUS "add_library( ${name} OBJECT ${ARGN} )" )
   if( CMAKE_BUILD_TYPE MATCHES Debug )
+    # -fstack-protector-all -Wstack-protector -fno-omit-frame-pointer
     set_property(TARGET ${name} PROPERTY COMPILE_FLAGS "-fPIC -Wall")
   else( )

tol/OIS/oisloader.cpp

@@ -470 +470 @@
 {
   TRACE_OIS_STREAM("READ",stream,"BClass", BText("")<<cls.FullName());
-//Std(BText(""\nBOisLoader::Read Class ")+cls.Name()+" "+cls.FullName());
+  //Std(BText("BOisLoader::Read Class ")+cls.Name()+" "+cls.FullName() + "\n");
+  
   BMemberOwner::BClassByNameHash& parents = *cls.parentHash_;
   Ensure(Read(cls,parents,stream));
@@ -568 +569 @@
   ERead(pr, stream);
   ERead(cl, stream);
-  BToken* token = new BToken(name,(BTokenType)tt,pr);
+  BToken* token = NULL;
+  if ( tt == TYPE )
+    {
+    token = new BTypeToken( name, BTypeToken::BTOIS );
+    }
+  else
+    {
+    token = new BToken(name,(BTokenType)tt,pr);
+    }
   token->PutClose(GetTokenCloseFromId(cl));
 #ifdef TRACE_OIS_TOKEN
@@ -647 +656 @@
   pos+=sizeof(char);
 
-  BToken* token = new BToken(name,(BTokenType)tt,pr);
+  BToken* token = NULL;
+  if ( tt == TYPE )
+    {
+    token = new BTypeToken( name, BTypeToken::BTOIS );
+    }
+  else
+    {
+     token = new BToken(name,(BTokenType)tt,pr);
+    }
   token->PutClose(GetTokenCloseFromId(cl));
 #ifdef TRACE_OIS_TOKEN

tol/bparser/tol_btoken.h

@@ -243 +243 @@
     BSYSTEM,
     BSTRUCT,
-    BCLASS
+    BCLASS,
+    BTOIS
   };
   BType type_;

tol/btol/bgrammar/oprimp.cpp

@@ -783 +783 @@
       if(!str) { cls = FindClass(tokName,-1); }
     }
-         if(str) { gra = GraSet(); }
+    if(str) { gra = GraSet(); }
     else if(cls) { gra = GraNameBlock(); }
     left = Tree::treLeft(left);

tol/btol/matrix_type/tol_mat.hpp

@@ -144 +144 @@
     return;
   }
-  double rc=(double)r*(double)c;
-  if(rc>=max_size) { rc=0; }
-  data_.ReallocBuffer((int)rc);
+  //double rc=(double)r*(double)c;
+  //if(rc>=max_size) { rc=0; }
+  //data_.ReallocBuffer((int)rc);
+  data_.ReallocBuffer( r * c );
   buffer_ = data_.GetBuffer();
   if(r && c && !buffer_) 

tol/btol/matrix_type/tol_matgen.hpp

@@ -135 +135 @@
     return;
   }
-  double rc=(double)r*(double)c;
-  if(rc>=max_size) { rc=0; }
-  data_.ReallocBuffer((int)rc);
+  //double rc=(double)r*(double)c;
+  // if(rc>=max_size) { rc=0; }
+  // data_.ReallocBuffer((int)rc);
+  data_.ReallocBuffer( r * c );
   buffer_ = data_.GetBuffer();
   if(r && c && !buffer_) 
-  { 
+  {
     Error(I2("FATAL: Cannot allocate memory for a matrix ",
              "FATAL: No se pudo alojar memoria para una matriz ")+