Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
P
preprocessor
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Dóra Kocsis
preprocessor
Commits
a7f8eaa3
Commit
a7f8eaa3
authored
Jul 9, 2018
by
Houtan Bastani
Browse files
Options
Downloads
Patches
Plain Diff
remove warnings introduced in
24455239
parent
853cce55
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/macro/MacroDriver.cc
+2
-2
2 additions, 2 deletions
src/macro/MacroDriver.cc
src/macro/MacroValue.cc
+1
-1
1 addition, 1 deletion
src/macro/MacroValue.cc
with
3 additions
and
3 deletions
src/macro/MacroDriver.cc
+
2
−
2
View file @
a7f8eaa3
...
...
@@ -107,7 +107,7 @@ MacroDriver::replace_vars_in_str(const string &s) const
regex_search
(
macro
,
name
,
name_regex
);
try
{
const
MacroValue
*
mv
;
const
MacroValue
*
mv
=
nullptr
;
bool
found_in_func_env
=
false
;
for
(
unsigned
i
=
func_env
.
size
();
i
--
>
0
;)
{
...
...
@@ -162,7 +162,7 @@ MacroDriver::eval_string_function(const string &name, const MacroValue *args)
throw
MacroValue
::
TypeError
(
"You are using "
+
name
+
" as if it were a macro function"
);
vector
<
string
*>
func_args
=
fmv
->
get_args
();
if
(
func_args
.
size
()
!=
dynamic_cast
<
const
IntMV
*>
(
args
->
length
())
->
get_int_value
())
if
(
func_args
.
size
()
!=
(
size_t
)
dynamic_cast
<
const
IntMV
*>
(
args
->
length
())
->
get_int_value
())
{
cerr
<<
"Macroprocessor: The evaluation of: "
<<
name
<<
" could not be completed"
<<
endl
<<
"because the number of arguments provided is different than the number of"
<<
endl
...
...
This diff is collapsed.
Click to expand it.
src/macro/MacroValue.cc
+
1
−
1
View file @
a7f8eaa3
...
...
@@ -523,7 +523,7 @@ FuncMV::operator==(const MacroValue &mv) const noexcept(false)
return
new
IntMV
(
driver
,
0
);
if
(
args
.
size
()
==
mv2
->
args
.
size
())
for
(
in
t
i
=
0
;
i
<
args
.
size
();
i
++
)
for
(
size_
t
i
=
0
;
i
<
args
.
size
();
i
++
)
if
(
args
[
i
]
!=
mv2
->
args
[
i
])
return
new
IntMV
(
driver
,
0
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment