[Scummvm-git-logs] scummvm master -> aca8a0ca5b1ea854af8eada25957d846208c32eb
sev-
sev at scummvm.org
Mon Jul 20 12:41:51 UTC 2020
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
aca8a0ca5b JANITORIAL: Whitespace changes
Commit: aca8a0ca5b1ea854af8eada25957d846208c32eb
https://github.com/scummvm/scummvm/commit/aca8a0ca5b1ea854af8eada25957d846208c32eb
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-07-20T14:41:25+02:00
Commit Message:
JANITORIAL: Whitespace changes
Changed paths:
engines/director/lingo/lingo-gr.cpp
engines/director/lingo/lingo-gr.y
diff --git a/engines/director/lingo/lingo-gr.cpp b/engines/director/lingo/lingo-gr.cpp
index 88e8917c79..1fbb2409c1 100644
--- a/engines/director/lingo/lingo-gr.cpp
+++ b/engines/director/lingo/lingo-gr.cpp
@@ -2191,7 +2191,7 @@ yyreduce:
case 12:
#line 227 "engines/director/lingo/lingo-gr.y"
- {
+ {
g_lingo->code1(LC::c_varpush);
g_lingo->codeString((yyvsp[0].s)->c_str());
mVar((yyvsp[0].s), globalCheck());
@@ -2203,7 +2203,7 @@ yyreduce:
case 13:
#line 234 "engines/director/lingo/lingo-gr.y"
- {
+ {
g_lingo->code1(LC::c_assign);
(yyval.code) = (yyvsp[-2].code); }
#line 2210 "engines/director/lingo/lingo-gr.cpp"
@@ -2227,7 +2227,7 @@ yyreduce:
case 15:
#line 249 "engines/director/lingo/lingo-gr.y"
- {
+ {
g_lingo->code1(LC::c_varpush);
g_lingo->codeString((yyvsp[0].s)->c_str());
mVar((yyvsp[0].s), globalCheck());
@@ -2239,7 +2239,7 @@ yyreduce:
case 16:
#line 256 "engines/director/lingo/lingo-gr.y"
- {
+ {
g_lingo->code1(LC::c_after);
(yyval.code) = (yyvsp[-2].code); }
#line 2246 "engines/director/lingo/lingo-gr.cpp"
@@ -2247,7 +2247,7 @@ yyreduce:
case 17:
#line 259 "engines/director/lingo/lingo-gr.y"
- {
+ {
g_lingo->code1(LC::c_varpush);
g_lingo->codeString((yyvsp[0].s)->c_str());
mVar((yyvsp[0].s), globalCheck());
@@ -2259,7 +2259,7 @@ yyreduce:
case 18:
#line 266 "engines/director/lingo/lingo-gr.y"
- {
+ {
g_lingo->code1(LC::c_before);
(yyval.code) = (yyvsp[-2].code); }
#line 2266 "engines/director/lingo/lingo-gr.cpp"
@@ -2267,7 +2267,7 @@ yyreduce:
case 19:
#line 269 "engines/director/lingo/lingo-gr.y"
- {
+ {
g_lingo->code1(LC::c_varpush);
g_lingo->codeString((yyvsp[-2].s)->c_str());
mVar((yyvsp[-2].s), globalCheck());
@@ -2279,7 +2279,7 @@ yyreduce:
case 20:
#line 276 "engines/director/lingo/lingo-gr.y"
- {
+ {
g_lingo->code1(LC::c_intpush);
g_lingo->codeInt(0); // Put dummy id
g_lingo->code1(LC::c_theentityassign);
@@ -2291,7 +2291,7 @@ yyreduce:
case 21:
#line 283 "engines/director/lingo/lingo-gr.y"
- {
+ {
g_lingo->code1(LC::c_varpush);
g_lingo->codeString((yyvsp[-2].s)->c_str());
mVar((yyvsp[-2].s), globalCheck());
@@ -2303,7 +2303,7 @@ yyreduce:
case 22:
#line 290 "engines/director/lingo/lingo-gr.y"
- {
+ {
g_lingo->code1(LC::c_intpush);
g_lingo->codeInt(0); // Put dummy id
g_lingo->code1(LC::c_theentityassign);
@@ -2369,7 +2369,7 @@ yyreduce:
case 27:
#line 332 "engines/director/lingo/lingo-gr.y"
- {
+ {
g_lingo->code1(LC::c_objectpropassign);
g_lingo->codeString((yyvsp[-2].objectprop).obj->c_str());
g_lingo->codeString((yyvsp[-2].objectprop).prop->c_str());
@@ -2381,7 +2381,7 @@ yyreduce:
case 28:
#line 339 "engines/director/lingo/lingo-gr.y"
- {
+ {
g_lingo->code1(LC::c_objectpropassign);
g_lingo->codeString((yyvsp[-2].objectprop).obj->c_str());
g_lingo->codeString((yyvsp[-2].objectprop).prop->c_str());
@@ -2557,7 +2557,7 @@ yyreduce:
case 46:
#line 480 "engines/director/lingo/lingo-gr.y"
- {
+ {
if (g_lingo->_repeatStack.size()) {
g_lingo->code2(LC::c_jump, 0);
int pos = g_lingo->_currentAssembly->size() - 1;
@@ -2570,7 +2570,7 @@ yyreduce:
case 47:
#line 488 "engines/director/lingo/lingo-gr.y"
- {
+ {
g_lingo->code1(LC::c_whencode);
g_lingo->codeString((yyvsp[-2].s)->c_str()); }
#line 2577 "engines/director/lingo/lingo-gr.cpp"
@@ -2731,7 +2731,7 @@ yyreduce:
case 75:
#line 564 "engines/director/lingo/lingo-gr.y"
- {
+ {
(yyval.code) = g_lingo->code1(LC::c_intpush);
g_lingo->codeInt(0); // Put dummy id
g_lingo->code1(LC::c_theentitypush);
@@ -2771,7 +2771,7 @@ yyreduce:
case 79:
#line 584 "engines/director/lingo/lingo-gr.y"
- {
+ {
g_lingo->code1(LC::c_objectproppush);
g_lingo->codeString((yyvsp[0].objectprop).obj->c_str());
g_lingo->codeString((yyvsp[0].objectprop).prop->c_str());
@@ -2820,7 +2820,7 @@ yyreduce:
case 86:
#line 604 "engines/director/lingo/lingo-gr.y"
- {
+ {
(yyval.code) = g_lingo->codeFunc((yyvsp[-3].s), (yyvsp[-1].narg));
delete (yyvsp[-3].s); }
#line 2827 "engines/director/lingo/lingo-gr.cpp"
@@ -2828,7 +2828,7 @@ yyreduce:
case 87:
#line 607 "engines/director/lingo/lingo-gr.y"
- {
+ {
if (g_lingo->_builtinConsts.contains(*(yyvsp[0].s))) {
(yyval.code) = g_lingo->code1(LC::c_constpush);
} else {
diff --git a/engines/director/lingo/lingo-gr.y b/engines/director/lingo/lingo-gr.y
index 9c196f41d4..bb9a73f0f0 100644
--- a/engines/director/lingo/lingo-gr.y
+++ b/engines/director/lingo/lingo-gr.y
@@ -224,14 +224,14 @@ ID: VARID
| tSCRIPT { $$ = new Common::String("script"); }
| tWINDOW { $$ = new Common::String("window"); }
-asgn: tPUT expr tINTO ID {
+asgn: tPUT expr tINTO ID {
g_lingo->code1(LC::c_varpush);
g_lingo->codeString($ID->c_str());
mVar($ID, globalCheck());
g_lingo->code1(LC::c_assign);
$$ = $expr;
delete $ID; }
- | tPUT expr tINTO chunkexpr {
+ | tPUT expr tINTO chunkexpr {
g_lingo->code1(LC::c_assign);
$$ = $expr; }
// {put the number of menuItems of} menu into <expr>
@@ -246,48 +246,48 @@ asgn: tPUT expr tINTO ID {
g_lingo->codeInt($THEMENUITEMSENTITY[1]);
g_lingo->code1(LC::c_assign);
$$ = $expr; }
- | tPUT expr tAFTER ID {
+ | tPUT expr tAFTER ID {
g_lingo->code1(LC::c_varpush);
g_lingo->codeString($ID->c_str());
mVar($ID, globalCheck());
g_lingo->code1(LC::c_after);
$$ = $expr;
delete $ID; } // D3
- | tPUT expr tAFTER chunkexpr {
+ | tPUT expr tAFTER chunkexpr {
g_lingo->code1(LC::c_after);
$$ = $expr; }
- | tPUT expr tBEFORE ID {
+ | tPUT expr tBEFORE ID {
g_lingo->code1(LC::c_varpush);
g_lingo->codeString($ID->c_str());
mVar($ID, globalCheck());
g_lingo->code1(LC::c_before);
$$ = $expr;
delete $ID; } // D3
- | tPUT expr tBEFORE chunkexpr {
+ | tPUT expr tBEFORE chunkexpr {
g_lingo->code1(LC::c_before);
$$ = $expr; }
- | tSET ID tEQ expr {
+ | tSET ID tEQ expr {
g_lingo->code1(LC::c_varpush);
g_lingo->codeString($ID->c_str());
mVar($ID, globalCheck());
g_lingo->code1(LC::c_assign);
$$ = $expr;
delete $ID; }
- | tSET THEENTITY tEQ expr {
+ | tSET THEENTITY tEQ expr {
g_lingo->code1(LC::c_intpush);
g_lingo->codeInt(0); // Put dummy id
g_lingo->code1(LC::c_theentityassign);
g_lingo->codeInt($THEENTITY[0]);
g_lingo->codeInt($THEENTITY[1]);
$$ = $expr; }
- | tSET ID tTO expr {
+ | tSET ID tTO expr {
g_lingo->code1(LC::c_varpush);
g_lingo->codeString($ID->c_str());
mVar($ID, globalCheck());
g_lingo->code1(LC::c_assign);
$$ = $expr;
delete $ID; }
- | tSET THEENTITY tTO expr {
+ | tSET THEENTITY tTO expr {
g_lingo->code1(LC::c_intpush);
g_lingo->codeInt(0); // Put dummy id
g_lingo->code1(LC::c_theentityassign);
@@ -329,14 +329,14 @@ asgn: tPUT expr tINTO ID {
g_lingo->codeInt($THEMENUITEMENTITY[0]);
g_lingo->codeInt($THEMENUITEMENTITY[1]);
$$ = $expr; }
- | tSET THEOBJECTPROP tTO expr {
+ | tSET THEOBJECTPROP tTO expr {
g_lingo->code1(LC::c_objectpropassign);
g_lingo->codeString($THEOBJECTPROP.obj->c_str());
g_lingo->codeString($THEOBJECTPROP.prop->c_str());
delete $THEOBJECTPROP.obj;
delete $THEOBJECTPROP.prop;
$$ = $expr; }
- | tSET THEOBJECTPROP tEQ expr {
+ | tSET THEOBJECTPROP tEQ expr {
g_lingo->code1(LC::c_objectpropassign);
g_lingo->codeString($THEOBJECTPROP.obj->c_str());
g_lingo->codeString($THEOBJECTPROP.prop->c_str());
@@ -477,7 +477,7 @@ stmt: stmtoneliner
(*g_lingo->_currentAssembly)[$jumpifz] = end; /* end, if cond fails */
endRepeat(end2, nextPos); } /* code any exit/next repeats */
- | tNEXT tREPEAT {
+ | tNEXT tREPEAT {
if (g_lingo->_repeatStack.size()) {
g_lingo->code2(LC::c_jump, 0);
int pos = g_lingo->_currentAssembly->size() - 1;
@@ -485,7 +485,7 @@ stmt: stmtoneliner
} else {
warning("# LINGO: next repeat not inside repeat block");
} }
- | tWHEN ID tTHEN expr {
+ | tWHEN ID tTHEN expr {
g_lingo->code1(LC::c_whencode);
g_lingo->codeString($ID->c_str()); }
| tTELL expr '\n' tellstart stmtlist lbl tENDTELL { g_lingo->code1(LC::c_telldone); }
@@ -561,7 +561,7 @@ simpleexprnoparens: INT {
| '-' simpleexpr[arg] %prec UNARY { $$ = $arg; g_lingo->code1(LC::c_negate); }
| tNOT simpleexpr %prec UNARY { g_lingo->code1(LC::c_not); }
| reference
- | THEENTITY {
+ | THEENTITY {
$$ = g_lingo->code1(LC::c_intpush);
g_lingo->codeInt(0); // Put dummy id
g_lingo->code1(LC::c_theentitypush);
@@ -581,7 +581,7 @@ simpleexprnoparens: INT {
| THEFUNC tOF simpleexpr {
$$ = g_lingo->codeFunc($THEFUNC, 1);
delete $THEFUNC; }
- | THEOBJECTPROP {
+ | THEOBJECTPROP {
g_lingo->code1(LC::c_objectproppush);
g_lingo->codeString($THEOBJECTPROP.obj->c_str());
g_lingo->codeString($THEOBJECTPROP.prop->c_str());
@@ -601,10 +601,10 @@ simpleexprnoparens: INT {
g_lingo->codeFunc($func, $nonemptyarglist + 1);
delete $func;
delete $method; }
- | ID '(' arglist ')' {
+ | ID '(' arglist ')' {
$$ = g_lingo->codeFunc($ID, $arglist);
delete $ID; }
- | ID {
+ | ID {
if (g_lingo->_builtinConsts.contains(*$ID)) {
$$ = g_lingo->code1(LC::c_constpush);
} else {
More information about the Scummvm-git-logs
mailing list