formatting

This commit is contained in:
Joseph Poirier 2015-06-20 06:16:30 -05:00
parent 44ec8b0ccf
commit 6e1c3aa71d
3 changed files with 10 additions and 10 deletions

View file

@ -593,7 +593,7 @@ void StdioPrintf(struct ParseState *Parser, struct Value *ReturnValue,
struct StdVararg PrintfArgs; struct StdVararg PrintfArgs;
PrintfArgs.Param = Param; PrintfArgs.Param = Param;
PrintfArgs.NumArgs = NumArgs-1; PrintfArgs.NumArgs = NumArgs - 1;
ReturnValue->Val->Integer = StdioBasePrintf(Parser, stdout, NULL, 0, ReturnValue->Val->Integer = StdioBasePrintf(Parser, stdout, NULL, 0,
Param[0]->Val->Pointer, &PrintfArgs); Param[0]->Val->Pointer, &PrintfArgs);
} }
@ -611,7 +611,7 @@ void StdioFprintf(struct ParseState *Parser, struct Value *ReturnValue,
struct StdVararg PrintfArgs; struct StdVararg PrintfArgs;
PrintfArgs.Param = Param + 1; PrintfArgs.Param = Param + 1;
PrintfArgs.NumArgs = NumArgs-2; PrintfArgs.NumArgs = NumArgs - 2;
ReturnValue->Val->Integer = StdioBasePrintf(Parser, Param[0]->Val->Pointer, ReturnValue->Val->Integer = StdioBasePrintf(Parser, Param[0]->Val->Pointer,
NULL, 0, Param[1]->Val->Pointer, &PrintfArgs); NULL, 0, Param[1]->Val->Pointer, &PrintfArgs);
} }
@ -629,7 +629,7 @@ void StdioSprintf(struct ParseState *Parser, struct Value *ReturnValue,
struct StdVararg PrintfArgs; struct StdVararg PrintfArgs;
PrintfArgs.Param = Param + 1; PrintfArgs.Param = Param + 1;
PrintfArgs.NumArgs = NumArgs-2; PrintfArgs.NumArgs = NumArgs - 2;
ReturnValue->Val->Integer = StdioBasePrintf(Parser, NULL, ReturnValue->Val->Integer = StdioBasePrintf(Parser, NULL,
Param[0]->Val->Pointer, -1, Param[1]->Val->Pointer, &PrintfArgs); Param[0]->Val->Pointer, -1, Param[1]->Val->Pointer, &PrintfArgs);
} }
@ -639,8 +639,8 @@ void StdioSnprintf(struct ParseState *Parser, struct Value *ReturnValue,
{ {
struct StdVararg PrintfArgs; struct StdVararg PrintfArgs;
PrintfArgs.Param = Param+2; PrintfArgs.Param = Param + 2;
PrintfArgs.NumArgs = NumArgs-3; PrintfArgs.NumArgs = NumArgs - 3;
ReturnValue->Val->Integer = StdioBasePrintf(Parser, NULL, ReturnValue->Val->Integer = StdioBasePrintf(Parser, NULL,
Param[0]->Val->Pointer, Param[1]->Val->Integer, Param[2]->Val->Pointer, Param[0]->Val->Pointer, Param[1]->Val->Integer, Param[2]->Val->Pointer,
&PrintfArgs); &PrintfArgs);
@ -652,7 +652,7 @@ void StdioScanf(struct ParseState *Parser, struct Value *ReturnValue,
struct StdVararg ScanfArgs; struct StdVararg ScanfArgs;
ScanfArgs.Param = Param; ScanfArgs.Param = Param;
ScanfArgs.NumArgs = NumArgs-1; ScanfArgs.NumArgs = NumArgs - 1;
ReturnValue->Val->Integer = StdioBaseScanf(Parser, stdin, NULL, ReturnValue->Val->Integer = StdioBaseScanf(Parser, stdin, NULL,
Param[0]->Val->Pointer, &ScanfArgs); Param[0]->Val->Pointer, &ScanfArgs);
} }
@ -663,7 +663,7 @@ void StdioFscanf(struct ParseState *Parser, struct Value *ReturnValue,
struct StdVararg ScanfArgs; struct StdVararg ScanfArgs;
ScanfArgs.Param = Param+1; ScanfArgs.Param = Param+1;
ScanfArgs.NumArgs = NumArgs-2; ScanfArgs.NumArgs = NumArgs - 2;
ReturnValue->Val->Integer = StdioBaseScanf(Parser, Param[0]->Val->Pointer, ReturnValue->Val->Integer = StdioBaseScanf(Parser, Param[0]->Val->Pointer,
NULL, Param[1]->Val->Pointer, &ScanfArgs); NULL, Param[1]->Val->Pointer, &ScanfArgs);
} }
@ -674,7 +674,7 @@ void StdioSscanf(struct ParseState *Parser, struct Value *ReturnValue,
struct StdVararg ScanfArgs; struct StdVararg ScanfArgs;
ScanfArgs.Param = Param+1; ScanfArgs.Param = Param+1;
ScanfArgs.NumArgs = NumArgs-2; ScanfArgs.NumArgs = NumArgs - 2;
ReturnValue->Val->Integer = StdioBaseScanf(Parser, NULL, ReturnValue->Val->Integer = StdioBaseScanf(Parser, NULL,
Param[0]->Val->Pointer, Param[1]->Val->Pointer, &ScanfArgs); Param[0]->Val->Pointer, Param[1]->Val->Pointer, &ScanfArgs);
} }

View file

@ -1569,7 +1569,8 @@ int ExpressionParse(struct ParseState *Parser, struct Value **Result)
case TokenColon: case TokenColon:
TernaryDepth--; TernaryDepth--;
break; break;
default: break; default:
break;
} }
} }

View file

@ -446,7 +446,6 @@ void VariableStackPop(struct ParseState *Parser, struct Value *Var)
if (Var->ValOnHeap) { if (Var->ValOnHeap) {
if (Var->Val != NULL) if (Var->Val != NULL)
HeapFreeMem(Parser->pc, Var->Val); HeapFreeMem(Parser->pc, Var->Val);
Success = HeapPopStack(Parser->pc, Var, sizeof(struct Value)); /* free from heap */ Success = HeapPopStack(Parser->pc, Var, sizeof(struct Value)); /* free from heap */
} else if (Var->ValOnStack) } else if (Var->ValOnStack)
Success = HeapPopStack(Parser->pc, Var, Success = HeapPopStack(Parser->pc, Var,