Code indexing in gitaly is broken and leads to code not being visible to the user. We work on the issue with highest priority.

Skip to content
Snippets Groups Projects

Resolve "parse error in VFFA-1.in"

Merged snuverink_j requested to merge 584-parse-error-in-vffa-1-in into OPAL-2.4
2 files
+ 46
38
Compare changes
  • Side-by-side
  • Inline
Files
2
+ 24
18
// ------------------------------------------------------------------------
// $RCSfile: MacroCmd.cpp,v $
// ------------------------------------------------------------------------
// $Revision: 1.1.1.1 $
// ------------------------------------------------------------------------
// Copyright: see Copyright.readme
// ------------------------------------------------------------------------
//
// Class: MacroCmd
// Class MacroCmd
//
// This class parses the MACRO command.
// Encapsulate the buffer for the ``archetypes'' of all macros.
// The macro is stored as a MacroStream. For execution, first the
// parameters are replaced, then the resulting stream is sent to the parser.
//
// Copyright (c) 2008 - 2020, Paul Scherrer Institut, Villigen PSI, Switzerland
//
// All rights reserved
//
// This file is part of OPAL.
//
// ------------------------------------------------------------------------
// OPAL is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// $Date: 2000/03/27 09:33:43 $
// $Author: Andreas Adelmann $
// You should have received a copy of the GNU General Public License
// along with OPAL. If not, see <https://www.gnu.org/licenses/>.
//
// ------------------------------------------------------------------------
#include "OpalParser/MacroCmd.h"
#include "Utility/PAssert.h"
#include "AbstractObjects/OpalData.h"
#include "OpalParser/OpalParser.h"
#include "Parser/Statement.h"
#include "Utilities/ParseError.h"
#include <vector>
#include <cassert>
// Class MacroCmd
// ------------------------------------------------------------------------
MacroCmd::MacroCmd():
Macro(0u, "MACRO",
@@ -99,7 +104,8 @@ Object *MacroCmd::makeTemplate
macro->parseFormals(statement);
// Parse macro body->
assert(statement.keyword("MACRO"));
bool isMacro = statement.keyword("MACRO");
PAssert(isMacro);
Token token;
if(statement.delimiter('{')) {
@@ -126,4 +132,4 @@ Object *MacroCmd::makeTemplate
}
return macro;
}
}
\ No newline at end of file
Loading