No comments

diff --git a/src/EDL/EDL_CMPLRS.edl b/src/EDL/EDL_CMPLRS.edl
index 3b031e289ca75d19e7304cac637a890f694ec4af..7eb7518824ffbe57d780b496885ce58e28defbe6 100755 (executable)
--- a/src/EDL/EDL_CMPLRS.edl
+++ b/src/EDL/EDL_CMPLRS.edl
@@ -7,8 +7,13 @@
 @set %EDL_CMPLRS_EDL = "";
 
 @if ( %Station == "hp" ) then
-@string %CMPLRS_C_Options = " -Ae ";
+   @string %CMPLRS_C_Options = " -Ae " %CMPLRS_C_Options ;
 @endif;
 
+@if ( %Station == "lin" ) then
+   @if ( %DebugMode == "False" ) then
+      @set %CMPLRS_C_ModeOpt = " -O2 -DNo_Exception ";
+    @endif;
+@endif;
 
 @endif;

diff --git a/src/EDL/EDL_Template.cxx b/src/EDL/EDL_Template.cxx
index d1151bb496a14864539538e03a77532e6f21721b..ce2b4f513fabdc8cc4b6e3ae580a829976d323fd 100755 (executable)
--- a/src/EDL/EDL_Template.cxx
+++ b/src/EDL/EDL_Template.cxx
@@ -95,59 +95,64 @@ void EDL_Template::ClearLines()
   myValue->Clear();
 }
 
-void EDL_Template::Eval(const Handle(EDL_HSequenceOfVariable)& aVar)
-{
-  Standard_Integer        nbVar  = aVar->Length(),
-                          nbLine = myValue->Length();
-  static char             newString[131072],
-                          result   [400000];
-  Standard_CString        vname, vvalue;
+void EDL_Template :: Eval (  const Handle( EDL_HSequenceOfVariable )& aVar  ) {
+
+ Standard_Integer nbVar  = aVar    -> Length ();
+ Standard_Integer nbLine = myValue -> Length ();
+
+ static char      newString[ 262144 ], result[ 400000 ];
+ Standard_CString vname, vvalue;
+
+ myEval -> Clear ();
+
+ newString[ 0 ] = '\0';
+ result[    0 ] = '\0';
 
-  myEval->Clear();
+ for ( Standard_Integer lineCount = 1; lineCount <= nbLine; ++lineCount ) {
 
-  newString[0] = '\0';
-  result[0]    = '\0';
+  Standard_Integer ipos, lenvname, rpos;
 
-  for (Standard_Integer lineCount = 1; lineCount <= nbLine; lineCount++) {
-    Standard_Integer ipos,lenvname,rpos;
+  memcpy (
+   newString,
+   myValue -> Value ( lineCount ).ToCString (),
+   myValue -> Value ( lineCount ).Length () + 1
+  );
 
-    memcpy(newString,myValue->Value(lineCount).ToCString(),myValue->Value(lineCount).Length()+1);
+  for ( Standard_Integer varCount = 1; varCount <= nbVar; ++varCount ) {
 
-    for (Standard_Integer varCount = 1; varCount <= nbVar; varCount++) {
-      vname  = aVar->Value(varCount).GetName();
-      vvalue = aVar->Value(varCount).GetValue();
-      lenvname = strlen(vname);
+   vname    = aVar -> Value ( varCount ).GetName  ();
+   vvalue   = aVar -> Value ( varCount ).GetValue ();
+   lenvname = strlen ( vname );
 
-      for (rpos = ipos = 0; newString[ipos] && ipos < 131072; ipos++) {
-       if (newString[ipos] == '%') {
+   for ( rpos = ipos = 0; newString[ ipos ] && ipos < 262144; ++ipos ) {
 
-         if (memcmp(&newString[ipos],vname,lenvname) == 0) {
-           for (Standard_Integer vpos = 0; vvalue[vpos] != 0; vpos++) {
-             result[rpos] = vvalue[vpos];
-             rpos++;
-           }
+    if ( newString[ ipos ] == '%' ) {
+
+     if (  memcmp ( &newString[ ipos ], vname, lenvname ) == 0  ) {
+
+      for ( Standard_Integer vpos = 0; vvalue[ vpos ] != 0; ++vpos )
+
+       result[ rpos++ ] = vvalue[ vpos ];
            
-           ipos += lenvname - 1;
-         }
-         else {
-           result[rpos] = newString[ipos];
-           rpos++;
-         }
-       }
-       else {
-         result[rpos] = newString[ipos];
-         rpos++;
-       }
-      }
-
-      result[rpos] = '\0';
-      memcpy(newString,result,rpos+1);
-    }
-
-    myEval->Append(TCollection_AsciiString());
-    myEval->ChangeValue(myEval->Length()).Copy(newString);
-  }
-}
+         ipos += lenvname - 1;
+
+     } else result[ rpos++ ] = newString[ ipos ];
+
+    } else result[ rpos++ ] = newString[ ipos ];
+
+   }  // end for
+
+   result[ rpos ] = '\0';
+   memcpy ( newString, result, rpos + 1 );
+
+  }  // end for
+
+  myEval -> Append (  TCollection_AsciiString ()  );
+  myEval -> ChangeValue (  myEval -> Length ()  ).Copy ( newString );
+
+ }  // end for
+
+}  // end EDL_Template :: Eval
 
 Handle(TColStd_HSequenceOfAsciiString) EDL_Template::GetEval() const 
 {