From 6bba42d8cf63a47da1b31f374cf993fcde54e060 Mon Sep 17 00:00:00 2001 From: cas Date: Wed, 3 Nov 1999 18:05:01 +0000 Subject: [PATCH] No comments --- src/EDL/EDL_API.cxx | 2 +- src/EDL/EDL_Interpretor.cxx | 240 ++++++++++++++++++++++++------------ 2 files changed, 161 insertions(+), 81 deletions(-) diff --git a/src/EDL/EDL_API.cxx b/src/EDL/EDL_API.cxx index 0a5f2a3..e92acd4 100755 --- a/src/EDL/EDL_API.cxx +++ b/src/EDL/EDL_API.cxx @@ -101,7 +101,7 @@ EDL_Template& EDL_API::GetTemplate(const Standard_CString aName) const void EDL_API::AddVariable(const Standard_CString aName, const Standard_CString aValue) const { - myInter->AddVariable(aName,aValue); + myInter->AddVariable(aName,aValue?aValue:""); } void EDL_API::AddVariable(const Standard_CString aName, diff --git a/src/EDL/EDL_Interpretor.cxx b/src/EDL/EDL_Interpretor.cxx index fe96eb9..d8527c7 100755 --- a/src/EDL/EDL_Interpretor.cxx +++ b/src/EDL/EDL_Interpretor.cxx @@ -523,7 +523,8 @@ void EDL_Interpretor::EvalTemplate(const Standard_CString aTemplate, const Stand nbByte = nbByte + aNewResult->Value(i).Length(); } - aValue = (Standard_CString) aStorageManager.Allocate(nbByte + 1); +// aValue = (Standard_CString) aStorageManager.Allocate(nbByte + 1); + aValue = (Standard_CString) Standard::Allocate(nbByte + 1); aValue[0] = '\0'; Standard_Integer idx=0; for (i = 1; i <= aNewResult->Length(); i++) { @@ -535,7 +536,8 @@ void EDL_Interpretor::EvalTemplate(const Standard_CString aTemplate, const Stand AddVariable(aResult,aValue); - aStorageManager.Free((void*&)aValue, nbByte + 1); +// aStorageManager.Free((void*&)aValue, nbByte + 1); + Standard::Free((void*&)aValue, nbByte + 1); } void EDL_Interpretor::RemoveTemplate(const Standard_CString aTemplate) @@ -827,7 +829,8 @@ void EDL_Interpretor::AddToArgList(const Standard_CString aVariable, const Stand void edl_add_include_directory(const edlstring adirectory) { GlobalInter->AddIncludeDirectory(adirectory.str); - if (adirectory.str) aStorageManager.Free((void*&)adirectory.str, adirectory.length+1); +// if (adirectory.str) aStorageManager.Free((void*&)adirectory.str, adirectory.length+1); + if (adirectory.str) Standard::Free((void*&)adirectory.str, adirectory.length+1); } // set type of parameter to varname @@ -958,8 +961,10 @@ void edl_set_pvarevalvar(const edlstring varname, const edlstring value) void edl_test_condition(const edlstring varname, int ope, const edlstring value) { if (!edl_must_execute()) { - if (varname.str) aStorageManager.Free((void*&) varname.str, varname.length+1); - if (value.str) aStorageManager.Free((void*&)value.str, value.length+1); +// if (varname.str) aStorageManager.Free((void*&) varname.str, varname.length+1); + if (varname.str) Standard::Free((void*&) varname.str, varname.length+1); +// if (value.str) aStorageManager.Free((void*&)value.str, value.length+1); + if (value.str) Standard::Free((void*&)value.str, value.length+1); return; } @@ -992,8 +997,10 @@ void edl_test_condition(const edlstring varname, int ope, const edlstring value) // we add the evaluation of the expression to the stack // GlobalInter->AddExpressionMember(aMember); - if (varname.str) aStorageManager.Free((void*&)varname.str, varname.length+1); - if (value.str) aStorageManager.Free((void*&)value.str, value.length+1); +// if (varname.str) aStorageManager.Free((void*&)varname.str, varname.length+1); + if (varname.str) Standard::Free((void*&)varname.str, varname.length+1); +// if (value.str) aStorageManager.Free((void*&)value.str, value.length+1); + if (value.str) Standard::Free((void*&)value.str, value.length+1); } // evaluation of a complex expression @@ -1052,13 +1059,15 @@ void edl_isvardefined(const edlstring varname) // GlobalInter->AddExecutionStatus(Result); } - if (varname.str) aStorageManager.Free((void*&)varname.str, varname.length+1); +// if (varname.str) aStorageManager.Free((void*&)varname.str, varname.length+1); + if (varname.str) Standard::Free((void*&)varname.str, varname.length+1); } void edl_isvardefinedm(const edlstring varname) { if (!edl_must_execute()) { - if (varname.str) aStorageManager.Free((void*&)varname.str, varname.length+1); +// if (varname.str) aStorageManager.Free((void*&)varname.str, varname.length+1); + if (varname.str) Standard::Free((void*&)varname.str, varname.length+1); return; } else { @@ -1068,7 +1077,8 @@ void edl_isvardefinedm(const edlstring varname) // GlobalInter->AddExpressionMember(Result); } - if (varname.str) aStorageManager.Free((void*&)varname.str, varname.length+1); +// if (varname.str) aStorageManager.Free((void*&)varname.str, varname.length+1); + if (varname.str) Standard::Free((void*&)varname.str, varname.length+1); } void edl_fileexist(const edlstring varname) @@ -1083,13 +1093,15 @@ void edl_fileexist(const edlstring varname) // GlobalInter->AddExecutionStatus(Result); } - if (varname.str) aStorageManager.Free((void*&)varname.str, varname.length+1); +// if (varname.str) aStorageManager.Free((void*&)varname.str, varname.length+1); + if (varname.str) Standard::Free((void*&)varname.str, varname.length+1); } void edl_fileexistm(const edlstring varname) { if (!edl_must_execute()) { - if (varname.str) aStorageManager.Free((void*&)varname.str, varname.length+1); +// if (varname.str) aStorageManager.Free((void*&)varname.str, varname.length+1); + if (varname.str) Standard::Free((void*&)varname.str, varname.length+1); return; } else { @@ -1099,7 +1111,8 @@ void edl_fileexistm(const edlstring varname) // GlobalInter->AddExpressionMember(Result); } - if (varname.str) aStorageManager.Free((void*&)varname.str, varname.length+1); +// if (varname.str) aStorageManager.Free((void*&)varname.str, varname.length+1); + if (varname.str) Standard::Free((void*&)varname.str, varname.length+1); } void edl_fileexist_var(const edlstring varname) @@ -1115,13 +1128,15 @@ void edl_fileexist_var(const edlstring varname) // GlobalInter->AddExecutionStatus(Result); } - if (varname.str) aStorageManager.Free((void*&)varname.str, varname.length+1); +// if (varname.str) aStorageManager.Free((void*&)varname.str, varname.length+1); + if (varname.str) Standard::Free((void*&)varname.str, varname.length+1); } void edl_fileexist_varm(const edlstring varname) { if (!edl_must_execute()) { - if (varname.str) aStorageManager.Free((void*&)varname.str, varname.length+1); +// if (varname.str) aStorageManager.Free((void*&)varname.str, varname.length+1); + if (varname.str) Standard::Free((void*&)varname.str, varname.length+1); return; } else { @@ -1132,7 +1147,8 @@ void edl_fileexist_varm(const edlstring varname) // GlobalInter->AddExpressionMember(Result); } - if (varname.str) aStorageManager.Free((void*&)varname.str, varname.length+1); +// if (varname.str) aStorageManager.Free((void*&)varname.str, varname.length+1); + if (varname.str) Standard::Free((void*&)varname.str, varname.length+1); } void edl_filenotexist(const edlstring varname) @@ -1147,13 +1163,15 @@ void edl_filenotexist(const edlstring varname) // GlobalInter->AddExecutionStatus(Result); } - if (varname.str) aStorageManager.Free((void*&)varname.str, varname.length+1); +// if (varname.str) aStorageManager.Free((void*&)varname.str, varname.length+1); + if (varname.str) Standard::Free((void*&)varname.str, varname.length+1); } void edl_filenotexistm(const edlstring varname) { if (!edl_must_execute()) { - if (varname.str) aStorageManager.Free((void*&)varname.str, varname.length+1); +// if (varname.str) aStorageManager.Free((void*&)varname.str, varname.length+1); + if (varname.str) Standard::Free((void*&)varname.str, varname.length+1); return; } else { @@ -1163,7 +1181,8 @@ void edl_filenotexistm(const edlstring varname) // GlobalInter->AddExpressionMember(Result); } - if (varname.str) aStorageManager.Free((void*&)varname.str, varname.length+1); +// if (varname.str) aStorageManager.Free((void*&)varname.str, varname.length+1); + if (varname.str) Standard::Free((void*&)varname.str, varname.length+1); } void edl_filenotexist_var(const edlstring varname) @@ -1179,13 +1198,15 @@ void edl_filenotexist_var(const edlstring varname) // GlobalInter->AddExecutionStatus(Result); } - if (varname.str) aStorageManager.Free((void*&)varname.str, varname.length+1); +// if (varname.str) aStorageManager.Free((void*&)varname.str, varname.length+1); + if (varname.str) Standard::Free((void*&)varname.str, varname.length+1); } void edl_filenotexist_varm(const edlstring varname) { if (!edl_must_execute()) { - if (varname.str) aStorageManager.Free((void*&)varname.str, varname.length+1); +// if (varname.str) aStorageManager.Free((void*&)varname.str, varname.length+1); + if (varname.str) Standard::Free((void*&)varname.str, varname.length+1); return; } else { @@ -1196,7 +1217,8 @@ void edl_filenotexist_varm(const edlstring varname) // GlobalInter->AddExpressionMember(Result); } - if (varname.str) aStorageManager.Free((void*&)varname.str, varname.length+1); +// if (varname.str) aStorageManager.Free((void*&)varname.str, varname.length+1); + if (varname.str) Standard::Free((void*&)varname.str, varname.length+1); } void edl_isvarnotdefined(const edlstring varname) @@ -1211,13 +1233,15 @@ void edl_isvarnotdefined(const edlstring varname) // GlobalInter->AddExecutionStatus(Result); } - if (varname.str) aStorageManager.Free((void*&)varname.str, varname.length+1); +// if (varname.str) aStorageManager.Free((void*&)varname.str, varname.length+1); + if (varname.str) Standard::Free((void*&)varname.str, varname.length+1); } void edl_isvarnotdefinedm(const edlstring varname) { if (!edl_must_execute()) { - if (varname.str) aStorageManager.Free((void*&)varname.str, varname.length+1); +// if (varname.str) aStorageManager.Free((void*&)varname.str, varname.length+1); + if (varname.str) Standard::Free((void*&)varname.str, varname.length+1); return; } else { @@ -1227,7 +1251,8 @@ void edl_isvarnotdefinedm(const edlstring varname) // GlobalInter->AddExpressionMember(Result); } - if (varname.str) aStorageManager.Free((void*&)varname.str, varname.length+1); +// if (varname.str) aStorageManager.Free((void*&)varname.str, varname.length+1); + if (varname.str) Standard::Free((void*&)varname.str, varname.length+1); } // remove one level of execution status @@ -1259,7 +1284,8 @@ void edl_cout() void edl_create_string_var(const edlstring varname) { if (!edl_must_execute()) { - if (varname.str) aStorageManager.Free((void*&)varname.str, varname.length+1); +// if (varname.str) aStorageManager.Free((void*&)varname.str, varname.length+1); + if (varname.str) Standard::Free((void*&)varname.str, varname.length+1); return; } const TCollection_AsciiString& asciistr = GlobalInter->GetPrintList(); @@ -1267,7 +1293,8 @@ void edl_create_string_var(const edlstring varname) astr.str = asciistr.ToCString(); astr.length = asciistr.Length(); edl_set_var(varname,astr); - if (varname.str) aStorageManager.Free((void*&)varname.str, varname.length+1); +// if (varname.str) aStorageManager.Free((void*&)varname.str, varname.length+1); + if (varname.str) Standard::Free((void*&)varname.str, varname.length+1); } // add the value of a variable to the print list @@ -1275,7 +1302,8 @@ void edl_create_string_var(const edlstring varname) void edl_printlist_add_var(const edlstring varname) { if (!edl_must_execute()) { - if (varname.str) aStorageManager.Free((void*&)varname.str, varname.length+1); +// if (varname.str) aStorageManager.Free((void*&)varname.str, varname.length+1); + if (varname.str) Standard::Free((void*&)varname.str, varname.length+1); return; } @@ -1284,7 +1312,8 @@ void edl_printlist_add_var(const edlstring varname) char* aString = GlobalInter->GetVariable(varname.str).GetValue(); GlobalInter->GetPrintList().AssignCat(aString); - if (varname.str) aStorageManager.Free((void*&)varname.str, varname.length+1); +// if (varname.str) aStorageManager.Free((void*&)varname.str, varname.length+1); + if (varname.str) Standard::Free((void*&)varname.str, varname.length+1); } // add the value of a variable to the print list @@ -1307,12 +1336,14 @@ void edl_printlist_addps_var(const edlstring varname) void edl_printlist_add_str(const edlstring str) { if (!edl_must_execute()) { - if (str.str) aStorageManager.Free((void *&)str.str,str.length+1); +// if (str.str) aStorageManager.Free((void *&)str.str,str.length+1); + if (str.str) Standard::Free((void *&)str.str,str.length+1); return; } GlobalInter->GetPrintList().AssignCat(str.str); - if (str.str) aStorageManager.Free((void *&)str.str,str.length+1); +// if (str.str) aStorageManager.Free((void *&)str.str,str.length+1); + if (str.str) Standard::Free((void *&)str.str,str.length+1); } // create a new template var @@ -1320,34 +1351,40 @@ void edl_printlist_add_str(const edlstring str) void edl_create_template(const edlstring varname) { if (!edl_must_execute()) { - if (varname.str) aStorageManager.Free((void*&)varname.str, varname.length+1); +// if (varname.str) aStorageManager.Free((void*&)varname.str, varname.length+1); + if (varname.str) Standard::Free((void*&)varname.str, varname.length+1); return; } GlobalInter->AddTemplate(varname.str); - if (varname.str) aStorageManager.Free((void*&)varname.str, varname.length+1); +// if (varname.str) aStorageManager.Free((void*&)varname.str, varname.length+1); + if (varname.str) Standard::Free((void*&)varname.str, varname.length+1); } void edl_set_template(const edlstring varname) { if (!edl_must_execute()) { - if (varname.str) aStorageManager.Free((void*&)varname.str, varname.length+1); +// if (varname.str) aStorageManager.Free((void*&)varname.str, varname.length+1); + if (varname.str) Standard::Free((void*&)varname.str, varname.length+1); return; } GlobalInter->AddToTemplate(varname.str); - if (varname.str) aStorageManager.Free((void*&)varname.str, varname.length+1); +// if (varname.str) aStorageManager.Free((void*&)varname.str, varname.length+1); + if (varname.str) Standard::Free((void*&)varname.str, varname.length+1); } void edl_clear_template(const edlstring varname) { if (!edl_must_execute()) { - if (varname.str) aStorageManager.Free((void*&)varname.str, varname.length+1); +// if (varname.str) aStorageManager.Free((void*&)varname.str, varname.length+1); + if (varname.str) Standard::Free((void*&)varname.str, varname.length+1); return; } GlobalInter->ClearTemplate(varname.str); - if (varname.str) aStorageManager.Free((void*&)varname.str, varname.length+1); +// if (varname.str) aStorageManager.Free((void*&)varname.str, varname.length+1); + if (varname.str) Standard::Free((void*&)varname.str, varname.length+1); } // add a line to a template in construction @@ -1355,14 +1392,16 @@ void edl_clear_template(const edlstring varname) void edl_add_to_template(const edlstring line) { if (!edl_must_execute()) { - if (line.str) aStorageManager.Free((void*&)line.str, line.length+1); +// if (line.str) aStorageManager.Free((void*&)line.str, line.length+1); + if (line.str) Standard::Free((void*&)line.str, line.length+1); return; } // we remove the $ // GlobalInter->GetTemplate(GlobalInter->GetCurrentTemplate().ToCString()).AddLine(&(line.str[1])); - if (line.str) aStorageManager.Free((void*&)line.str, line.length+1); +// if (line.str) aStorageManager.Free((void*&)line.str, line.length+1); + if (line.str) Standard::Free((void*&)line.str, line.length+1); } // close a template @@ -1379,7 +1418,8 @@ void edl_end_template() void edl_apply_template(const edlstring tempname) { if (!edl_must_execute()) { - if (tempname.str) aStorageManager.Free((void*&)tempname.str, tempname.length+1); +// if (tempname.str) aStorageManager.Free((void*&)tempname.str, tempname.length+1); + if (tempname.str) Standard::Free((void*&)tempname.str, tempname.length+1); return; } @@ -1397,7 +1437,8 @@ void edl_apply_template(const edlstring tempname) GlobalInter->AddToVariableList(listvar->Value(i)->ToCString()); } - if (tempname.str) aStorageManager.Free((void*&)tempname.str, tempname.length+1); +// if (tempname.str) aStorageManager.Free((void*&)tempname.str, tempname.length+1); + if (tempname.str) Standard::Free((void*&)tempname.str, tempname.length+1); } // add the variables used in the template @@ -1405,7 +1446,8 @@ void edl_apply_template(const edlstring tempname) void edl_add_to_varlist(const edlstring varname) { if (!edl_must_execute()) { - if (varname.str) aStorageManager.Free((void*&)varname.str, varname.length+1); +// if (varname.str) aStorageManager.Free((void*&)varname.str, varname.length+1); + if (varname.str) Standard::Free((void*&)varname.str, varname.length+1); return; } @@ -1413,7 +1455,8 @@ void edl_add_to_varlist(const edlstring varname) GlobalInter->GetTemplate(GlobalInter->GetCurrentTemplate().ToCString()).AddToVariableList(aVarName); - if (varname.str) aStorageManager.Free((void*&)varname.str, varname.length+1); +// if (varname.str) aStorageManager.Free((void*&)varname.str, varname.length+1); + if (varname.str) Standard::Free((void*&)varname.str, varname.length+1); } // evaluation of the template @@ -1421,14 +1464,16 @@ void edl_add_to_varlist(const edlstring varname) void edl_end_apply(const edlstring varname) { if (!edl_must_execute()) { - if (varname.str) aStorageManager.Free((void*&)varname.str, varname.length+1); +// if (varname.str) aStorageManager.Free((void*&)varname.str, varname.length+1); + if (varname.str) Standard::Free((void*&)varname.str, varname.length+1); return; } GlobalInter->EvalTemplate(GlobalInter->GetCurrentTemplate().ToCString(),varname.str); GlobalInter->ClearVariableList(); - if (varname.str) aStorageManager.Free((void*&)varname.str, varname.length+1); +// if (varname.str) aStorageManager.Free((void*&)varname.str, varname.length+1); + if (varname.str) Standard::Free((void*&)varname.str, varname.length+1); } // load and open a shared library @@ -1436,12 +1481,14 @@ void edl_end_apply(const edlstring varname) void edl_open_library(const edlstring library) { if (!edl_must_execute()) { - if (library.str) aStorageManager.Free((void*&)library.str, library.length+1); +// if (library.str) aStorageManager.Free((void*&)library.str, library.length+1); + if (library.str) Standard::Free((void*&)library.str, library.length+1); return; } GlobalInter->AddLibrary(library.str); - if (library.str) aStorageManager.Free((void*&)library.str, library.length+1); +// if (library.str) aStorageManager.Free((void*&)library.str, library.length+1); + if (library.str) Standard::Free((void*&)library.str, library.length+1); } // close a shared library @@ -1449,12 +1496,14 @@ void edl_open_library(const edlstring library) void edl_close_library(const edlstring library) { if (!edl_must_execute()) { - if (library.str) aStorageManager.Free((void*&)library.str, library.length+1); +// if (library.str) aStorageManager.Free((void*&)library.str, library.length+1); + if (library.str) Standard::Free((void*&)library.str, library.length+1); return; } GlobalInter->RemoveLibrary(library.str); - if (library.str) aStorageManager.Free((void*&)library.str, library.length+1); +// if (library.str) aStorageManager.Free((void*&)library.str, library.length+1); + if (library.str) Standard::Free((void*&)library.str, library.length+1); } // add a variable to arguments list @@ -1462,12 +1511,14 @@ void edl_close_library(const edlstring library) void edl_arglist_add_var(const edlstring varname) { if (!edl_must_execute()) { - if (varname.str) aStorageManager.Free((void*&)varname.str, varname.length+1); +// if (varname.str) aStorageManager.Free((void*&)varname.str, varname.length+1); + if (varname.str) Standard::Free((void*&)varname.str, varname.length+1); return; } GlobalInter->AddToArgList(varname.str); - if (varname.str) aStorageManager.Free((void*&)varname.str, varname.length+1); +// if (varname.str) aStorageManager.Free((void*&)varname.str, varname.length+1); + if (varname.str) Standard::Free((void*&)varname.str, varname.length+1); } // add a string to arguments list @@ -1477,12 +1528,14 @@ void edl_arglist_add_var(const edlstring varname) void edl_arglist_add_str(const edlstring string) { if (!edl_must_execute()) { - if (string.str) aStorageManager.Free((void*&)string.str, string.length+1); +// if (string.str) aStorageManager.Free((void*&)string.str, string.length+1); + if (string.str) Standard::Free((void*&)string.str, string.length+1); return; } GlobalInter->AddToArgList(".",string.str); - if (string.str) aStorageManager.Free((void*&)string.str, string.length+1); +// if (string.str) aStorageManager.Free((void*&)string.str, string.length+1); + if (string.str) Standard::Free((void*&)string.str, string.length+1); } // call a function in a library opened before @@ -1490,15 +1543,19 @@ void edl_arglist_add_str(const edlstring string) void edl_call_procedure_library(const edlstring libname, const edlstring funcname) { if (!edl_must_execute()) { - if (libname.str) aStorageManager.Free((void*&)libname.str, libname.length+1); - if (funcname.str) aStorageManager.Free((void*&)funcname.str, funcname.length+1); +// if (libname.str) aStorageManager.Free((void*&)libname.str, libname.length+1); + if (libname.str) Standard::Free((void*&)libname.str, libname.length+1); +// if (funcname.str) aStorageManager.Free((void*&)funcname.str, funcname.length+1); + if (funcname.str) Standard::Free((void*&)funcname.str, funcname.length+1); return; } EDL_Error aResult = GlobalInter->CallFunction(libname.str,funcname.str,0L); - if (libname.str) aStorageManager.Free((void*&)libname.str, libname.length+1); - if (funcname.str) aStorageManager.Free((void*&)funcname.str, funcname.length+1); +// if (libname.str) aStorageManager.Free((void*&)libname.str, libname.length+1); + if (libname.str) Standard::Free((void*&)libname.str, libname.length+1); +// if (funcname.str) aStorageManager.Free((void*&)funcname.str, funcname.length+1); + if (funcname.str) Standard::Free((void*&)funcname.str, funcname.length+1); if (aResult != EDL_NORMAL) { Standard_NoSuchObject::Raise(); @@ -1510,17 +1567,23 @@ void edl_call_procedure_library(const edlstring libname, const edlstring funcnam void edl_call_function_library(const edlstring libname, const edlstring funcname, const edlstring resname) { if (!edl_must_execute()) { - if (libname.str) aStorageManager.Free((void*&)libname.str, libname.length+1); - if (funcname.str) aStorageManager.Free((void*&)funcname.str, funcname.length+1); - if (resname.str) aStorageManager.Free((void*&)resname.str, resname.length+1); +// if (libname.str) aStorageManager.Free((void*&)libname.str, libname.length+1); + if (libname.str) Standard::Free((void*&)libname.str, libname.length+1); +// if (funcname.str) aStorageManager.Free((void*&)funcname.str, funcname.length+1); + if (funcname.str) Standard::Free((void*&)funcname.str, funcname.length+1); +// if (resname.str) aStorageManager.Free((void*&)resname.str, resname.length+1); + if (resname.str) Standard::Free((void*&)resname.str, resname.length+1); return; } EDL_Error aResult = GlobalInter->CallFunction(libname.str,funcname.str,resname.str); - if (libname.str) aStorageManager.Free((void*&)libname.str, libname.length+1); - if (funcname.str) aStorageManager.Free((void*&)funcname.str, funcname.length+1); - if (resname.str) aStorageManager.Free((void*&)resname.str, resname.length+1); +// if (libname.str) aStorageManager.Free((void*&)libname.str, libname.length+1); + if (libname.str) Standard::Free((void*&)libname.str, libname.length+1); +// if (funcname.str) aStorageManager.Free((void*&)funcname.str, funcname.length+1); + if (funcname.str) Standard::Free((void*&)funcname.str, funcname.length+1); +// if (resname.str) aStorageManager.Free((void*&)resname.str, resname.length+1); + if (resname.str) Standard::Free((void*&)resname.str, resname.length+1); if (aResult != EDL_NORMAL) { Standard_NoSuchObject::Raise(); @@ -1532,15 +1595,19 @@ void edl_call_function_library(const edlstring libname, const edlstring funcname void edl_open_file(const edlstring varname, const edlstring filename) { if (!edl_must_execute()) { - if (varname.str) aStorageManager.Free((void*&)varname.str, varname.length+1); - if (filename.str) aStorageManager.Free((void*&)filename.str, filename.length+1); +// if (varname.str) aStorageManager.Free((void*&)varname.str, varname.length+1); + if (varname.str) Standard::Free((void*&)varname.str, varname.length+1); +// if (filename.str) aStorageManager.Free((void*&)filename.str, filename.length+1); + if (filename.str) Standard::Free((void*&)filename.str, filename.length+1); return; } EDL_Error aResult = GlobalInter->AddFile(varname.str,filename.str); - if (varname.str) aStorageManager.Free((void*&)varname.str, varname.length+1); - if (filename.str) aStorageManager.Free((void*&)filename.str, filename.length+1); +// if (varname.str) aStorageManager.Free((void*&)varname.str, varname.length+1); + if (varname.str) Standard::Free((void*&)varname.str, varname.length+1); +// if (filename.str) aStorageManager.Free((void*&)filename.str, filename.length+1); + if (filename.str) Standard::Free((void*&)filename.str, filename.length+1); if (aResult != EDL_NORMAL) { Standard_NoSuchObject::Raise(); @@ -1552,8 +1619,10 @@ void edl_open_file(const edlstring varname, const edlstring filename) void edl_write_file(const edlstring varname, const edlstring buffername) { if (!edl_must_execute()) { - if (varname.str) aStorageManager.Free((void*&)varname.str, varname.length+1); - if (buffername.str) aStorageManager.Free((void*&)buffername.str, buffername.length+1); +// if (varname.str) aStorageManager.Free((void*&)varname.str, varname.length+1); + if (varname.str) Standard::Free((void*&)varname.str, varname.length+1); +// if (buffername.str) aStorageManager.Free((void*&)buffername.str, buffername.length+1); + if (buffername.str) Standard::Free((void*&)buffername.str, buffername.length+1); return; } @@ -1562,8 +1631,10 @@ void edl_write_file(const edlstring varname, const edlstring buffername) aFile.Write(aVar.GetValue()); - if (varname.str) aStorageManager.Free((void*&)varname.str, varname.length+1); - if (buffername.str) aStorageManager.Free((void*&)buffername.str, buffername.length+1); +// if (varname.str) aStorageManager.Free((void*&)varname.str, varname.length+1); + if (varname.str) Standard::Free((void*&)varname.str, varname.length+1); +// if (buffername.str) aStorageManager.Free((void*&)buffername.str, buffername.length+1); + if (buffername.str) Standard::Free((void*&)buffername.str, buffername.length+1); } // close a file @@ -1571,7 +1642,8 @@ void edl_write_file(const edlstring varname, const edlstring buffername) void edl_close_file(const edlstring varname) { if (!edl_must_execute()) { - if (varname.str) aStorageManager.Free((void*&)varname.str, varname.length+1); +// if (varname.str) aStorageManager.Free((void*&)varname.str, varname.length+1); + if (varname.str) Standard::Free((void*&)varname.str, varname.length+1); return; } @@ -1579,7 +1651,8 @@ void edl_close_file(const edlstring varname) aFile.Close(); GlobalInter->RemoveFile(varname.str); - if (varname.str) aStorageManager.Free((void*&)varname.str, varname.length+1); +// if (varname.str) aStorageManager.Free((void*&)varname.str, varname.length+1); + if (varname.str) Standard::Free((void*&)varname.str, varname.length+1); } // include and process a file @@ -1604,13 +1677,15 @@ void edl_uses_var(const edlstring var) TCollection_AsciiString anAscName = aVar.GetValue(); edlstring fname; - fname.str = (char *) aStorageManager.Allocate(anAscName.Length() + 1); +// fname.str = (char *) aStorageManager.Allocate(anAscName.Length() + 1); + fname.str = (char *) Standard::Allocate(anAscName.Length() + 1); memcpy(fname.str, anAscName.ToCString(), anAscName.Length()+1); fname.length = anAscName.Length(); edl_uses(fname); } - if (var.str) aStorageManager.Free((void*&)var.str, var.length+1); +// if (var.str) aStorageManager.Free((void*&)var.str, var.length+1); + if (var.str) Standard::Free((void*&)var.str, var.length+1); } void edl_uses(const edlstring filename) @@ -1678,14 +1753,16 @@ void edl_uses(const edlstring filename) if (EDLin == NULL) { EDL::PrintError(EDL_FILENOTOPENED,filename.str); - if (filename.str) aStorageManager.Free((void*&)filename.str, filename.length+1); +// if (filename.str) aStorageManager.Free((void*&)filename.str, filename.length+1); + if (filename.str) Standard::Free((void*&)filename.str, filename.length+1); EDLin = FileDesc[numFileDesc]; EDLlineno = LineStack[numFileDesc]; numFileDesc--; Standard_NoSuchObject::Raise(); } } - if (filename.str) aStorageManager.Free((void*&)filename.str, filename.length+1); +// if (filename.str) aStorageManager.Free((void*&)filename.str, filename.length+1); + if (filename.str) Standard::Free((void*&)filename.str, filename.length+1); } void edl_else_execution_status() @@ -1708,7 +1785,8 @@ void EDL_SetCurrentFile(const edlstring fname) edlstring edl_strdup(const char* buf, const int length) { edlstring ret; - ret.str = (char *) aStorageManager.Allocate(length+1); +// ret.str = (char *) aStorageManager.Allocate(length+1); + ret.str = (char *) Standard::Allocate(length+1); memcpy(ret.str, buf,length+1); ret.length = length; return ret; @@ -1717,7 +1795,8 @@ edlstring edl_strdup(const char* buf, const int length) edlstring edl_string(const char* buf, const int length) { edlstring ret; - ret.str = (char *) aStorageManager.Allocate(length-1); +// ret.str = (char *) aStorageManager.Allocate(length-1); + ret.str = (char *) Standard::Allocate(length-1); memcpy(ret.str, &buf[1], length-1); ret.str[length - 2] = '\0'; ret.length = length-2; @@ -1726,7 +1805,8 @@ edlstring edl_string(const char* buf, const int length) void edlstring_free(const edlstring buf) { - if(buf.str) aStorageManager.Free((void*&)buf.str, buf.length+1); +// if(buf.str) aStorageManager.Free((void*&)buf.str, buf.length+1); + if(buf.str) Standard::Free((void*&)buf.str, buf.length+1); } #ifdef HPUX -- 2.39.5