Fixing more tab/space issues

This commit is contained in:
mysticbbs 2012-02-27 18:38:09 -05:00
parent 19bdea67f5
commit 8460084849
4 changed files with 38 additions and 31 deletions

View File

@ -45,19 +45,24 @@ Var
Begin Begin
A := 1; A := 1;
B := 25; B := 25;
Repeat Repeat
If A > 1 Then Begin If A > 1 Then Begin
Screen.WriteXY (1, A-1, 0, strRep(' ', 80)); Screen.WriteXY (1, A-1, 0, strRep(' ', 80));
Screen.WriteXY (1, B+1, 0, strRep(' ', 80)); Screen.WriteXY (1, B+1, 0, strRep(' ', 80));
End; End;
Screen.WriteXY (1, A, 8, 'ú-' + strRep('Ä', 75) + '--ú'); Screen.WriteXY (1, A, 8, 'ú-' + strRep('Ä', 75) + '--ú');
Screen.WriteXY (1, B, 8, 'ú-' + strRep('Ä', 75) + '--ú'); Screen.WriteXY (1, B, 8, 'ú-' + strRep('Ä', 75) + '--ú');
WaitMS(15); WaitMS(15);
Inc (A); Inc (A);
Dec (B); Dec (B);
Until A = 14; Until A = 14;
A := 76; A := 76;
Repeat Repeat
Dec (A, 2); Dec (A, 2);
Screen.WriteXY (1, 13, 8, strPadC('ú-' + strRep('Ä', A) + '--ú', 80, ' ')); Screen.WriteXY (1, 13, 8, strPadC('ú-' + strRep('Ä', A) + '--ú', 80, ' '));

View File

@ -1415,13 +1415,13 @@ begin
end; end;
end; end;
Procedure TParserEngine.ParseVariable (vt : TIdentTypes); Procedure TParserEngine.ParseVariable (VT: TIdentTypes);
Begin Begin
if vt in vnums then ParseVarNumber else If VT in vNums Then ParseVarNumber Else
if vt = iString then ParseVarString else If VT = iString Then ParseVarString Else
if vt = iChar then ParseVarChar Else If VT = iChar Then ParseVarChar Else
if vt = iBool then ParseVarBoolean else If VT = iBool Then ParseVarBoolean Else
if vt = iFile then Error(mpsInStatement,''); If VT = iFile Then Error(mpsInStatement,'');
End; End;
Procedure TParserEngine.ParseVariableInfo (Param: Boolean; IsRec: Boolean; Var Info: TParserVarInfoRec); Procedure TParserEngine.ParseVariableInfo (Param: Boolean; IsRec: Boolean; Var Info: TParserVarInfoRec);
@ -1503,13 +1503,13 @@ Procedure TParserEngine.ParseVariableInfo (Param: Boolean; IsRec: Boolean; Var I
IdentStr := strLower(IdentStr); IdentStr := strLower(IdentStr);
// separate function? // separate function?
If IdentStr = tkv[iString] Then Info.vType := iString Else If IdentStr = tkv[iString ] Then Info.vType := iString Else
If IdentStr = tkv[iChar ] Then Info.vType := iChar Else If IdentStr = tkv[iChar ] Then Info.vType := iChar Else
If IdentStr = tkv[iByte ] Then Info.vType := iByte Else If IdentStr = tkv[iByte ] Then Info.vType := iByte Else
If IdentStr = tkv[iShort] Then Info.vType := iShort Else If IdentStr = tkv[iShort ] Then Info.vType := iShort Else
If IdentStr = tkv[iWord ] Then Info.vType := iWord Else If IdentStr = tkv[iWord ] Then Info.vType := iWord Else
If IdentStr = tkv[iInteger] Then Info.vType := iInteger Else If IdentStr = tkv[iInteger] Then Info.vType := iInteger Else
If IdentStr = tkv[iLongInt ] Then Info.vType := iLongInt Else If IdentStr = tkv[iLongInt] Then Info.vType := iLongInt Else
If IdentStr = tkv[iReal ] Then Info.vType := iReal Else If IdentStr = tkv[iReal ] Then Info.vType := iReal Else
If IdentStr = tkv[iBool ] Then Info.vType := iBool Else If IdentStr = tkv[iBool ] Then Info.vType := iBool Else
If IdentStr = tkv[iFile ] Then Begin If IdentStr = tkv[iFile ] Then Begin

View File

@ -196,7 +196,8 @@ Const
':', 'function', 'array', 'case', ':', 'function', 'array', 'case',
'of', '..', 'type', 'const', 'of', '..', 'type', 'const',
'break', 'continue', 'uses', 'exit', 'break', 'continue', 'uses', 'exit',
'$', 'and', 'or', 'xor', 'shl', 'shr' '$', 'and', 'or', 'xor',
'shl', 'shr'
); );
wTokensIPLC : TTokenWordType = ( wTokensIPLC : TTokenWordType = (
@ -215,7 +216,8 @@ Const
':', 'func', 'array', 'switch', ':', 'func', 'array', 'switch',
'of', '..', 'type', 'const', 'of', '..', 'type', 'const',
'break', 'continue', 'uses', 'exit', 'break', 'continue', 'uses', 'exit',
'$', '&', '|', 'xor', '<<', '>>' '$', '&', '|', 'xor',
'<<', '>>'
); );
{$ENDIF} {$ENDIF}