Commit 8f0201e4 authored by bonnell's avatar bonnell

Revert R20852 change to ExprParser.C, not correct fix for bug#1414

git-svn-id: 18c085ea-50e0-402c-830e-de6fd14e8384
parent 27ae3184
......@@ -51,7 +51,6 @@
#include <ParseException.h>
#include <string>
#include <vector>
#include <visit-config.h>
using std::vector;
using std::string;
......@@ -172,10 +171,6 @@ ExprParser::~ExprParser()
// Allow unary minus to get integrated directly into float and int
// constants.
// Kathleen Biagas, Mon Apr 29 19:35:54 MST 2013
// Use VISIT_SLASH_STRING for path separators, to preserve correct path
// form on windows.
// ****************************************************************************
ExprParser::ApplyRule(const Symbol &sym,
......@@ -417,13 +412,13 @@ ExprParser::ApplyRule(const Symbol &sym,
case 0:
node = E[0];
((PathExpr *) node)->Append(VISIT_SLASH_STRING);
((PathExpr *) node)->Append("/");
((PathExpr *) node)->Append(((Identifier*)T[2])->GetVal());
delete E[1];
case 1:
node = new PathExpr(p, VISIT_SLASH_STRING);
node = new PathExpr(p, "/");
((PathExpr *) node)->Append(((Identifier*)T[1])->GetVal());
delete E[0];
......@@ -107,7 +107,7 @@ enhancements and bug-fixes that were added to this release.</p>
<li>Lineout does not work on operator-created variables such as those created via the DataBinning operator.</li>
<li>Windows installer doesn't always show the host-profiles selections.</li>
<li>A bug in the exporting of STL files in parallel is fixed.</li>
<li>Engine crashes when using CMFE's on Windows.</li>
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment