[Aimmath-commit] AIM/WEB-INF/maple SafeParse.mpl,1.7,1.8

[Greg G. <gr...@us...>]

Update of /cvsroot/aimmath/AIM/WEB-INF/maple
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27793

Modified Files:
	SafeParse.mpl 
Log Message:
Moved the "Evaluation error" check after the `aim/SafeParse/Check` check
... where it should be!                                                - GG


Index: SafeParse.mpl
===================================================================
RCS file: /cvsroot/aimmath/AIM/WEB-INF/maple/SafeParse.mpl,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** SafeParse.mpl	14 Apr 2004 18:38:52 -0000	1.7
--- SafeParse.mpl	15 Apr 2004 08:53:27 -0000	1.8
***************
*** 563,590 ****
      RETURN(eval(report));
     fi;
!   else
!    try
!      ep := eval(p);
!    catch:
!      report['Status'] := "Evaluation error";
!      report['ErrorMessage'] := lasterr;
!      return eval(report);
!    end try;
!    if (c = `aim/SafeParse/CodeTable`['NAME']) then
!      q := convert(p,string);
!      if (q = l) then
!       report['Status'] := "Parse error";
!       report['ErrorMessage'] := m;
!       RETURN(eval(report));
!      fi;
!    fi;
    fi;
! 
    report['Status'] := "OK";
- 
    `aim/SafeParse/Check`(b,report);
  
!   report['Names'] := {report['Names']};
  
    report['Functions'] := indets([p],function);
  
--- 563,589 ----
      RETURN(eval(report));
     fi;
!   elif (c = `aim/SafeParse/CodeTable`['NAME']) then
!     q := convert(p,string);
!     if (q = l) then
!      report['Status'] := "Parse error";
!      report['ErrorMessage'] := m;
!      RETURN(eval(report));
!     fi;
    fi;
!    
    report['Status'] := "OK";
    `aim/SafeParse/Check`(b,report);
  
!   try
!     if (report['Status'] = "OK") then
!       ep := eval(p);
!     fi;
!   catch:
!     report['Status'] := "Evaluation error";
!     report['ErrorMessage'] := lasterr;
!     return eval(report);
!   end try;
  
+   report['Names'] := {report['Names']};
    report['Functions'] := indets([p],function);