diff --git a/mystic/install.pas b/mystic/install.pas index 34f03bf..1d5b4ab 100644 --- a/mystic/install.pas +++ b/mystic/install.pas @@ -45,19 +45,24 @@ Var Begin A := 1; B := 25; + Repeat If A > 1 Then Begin Screen.WriteXY (1, A-1, 0, strRep(' ', 80)); Screen.WriteXY (1, B+1, 0, strRep(' ', 80)); End; + Screen.WriteXY (1, A, 8, 'ú-' + strRep('Ä', 75) + '--ú'); Screen.WriteXY (1, B, 8, 'ú-' + strRep('Ä', 75) + '--ú'); + WaitMS(15); + Inc (A); Dec (B); Until A = 14; A := 76; + Repeat Dec (A, 2); Screen.WriteXY (1, 13, 8, strPadC('ú-' + strRep('Ä', A) + '--ú', 80, ' ')); @@ -115,7 +120,7 @@ End; Procedure MakeDir (Str: String); Var - A : Byte; + A : Byte; CurDIR : String; Prefix : String; Begin @@ -407,7 +412,7 @@ Begin Reset (CfgFile); Read (CfgFile, Cfg); - Cfg.SystemPath := Config.SystemPath; + Cfg.SystemPath := Config.SystemPath; Cfg.AttachPath := Config.AttachPath; Cfg.DataPath := Config.DataPath; Cfg.MsgsPath := Config.MsgsPath; @@ -415,7 +420,7 @@ Begin Cfg.QwkPath := Config.QwkPath; Cfg.ScriptPath := Config.ScriptPath; Cfg.LogsPath := Config.LogsPath; - Cfg.UserIdxPos := 0; + Cfg.UserIdxPos := 0; Cfg.SystemCalls := 0; Reset (CfgFile); diff --git a/mystic/mis_server.pas b/mystic/mis_server.pas index a5ac43c..fe83abb 100644 --- a/mystic/mis_server.pas +++ b/mystic/mis_server.pas @@ -30,11 +30,11 @@ Type Port : LongInt; TextPath : String[80]; - Constructor Create (Config: RecConfig; PortNum: Word; CliMax: Word; ND: TNodeData; CreateProc: TServerCreateProc); - Destructor Destroy; Override; - Procedure Execute; Override; - Function CheckIP (IP, Mask: String) : Boolean; - Function IsBlockedIP (Var Client: TSocketClass) : Boolean; + Constructor Create (Config: RecConfig; PortNum: Word; CliMax: Word; ND: TNodeData; CreateProc: TServerCreateProc); + Destructor Destroy; Override; + Procedure Execute; Override; + Function CheckIP (IP, Mask: String) : Boolean; + Function IsBlockedIP (Var Client: TSocketClass) : Boolean; Function DuplicateIPs (Var Client: TSocketClass) : Byte; End; diff --git a/mystic/mpl_compile.pas b/mystic/mpl_compile.pas index 62d7946..b5e3589 100644 --- a/mystic/mpl_compile.pas +++ b/mystic/mpl_compile.pas @@ -1386,12 +1386,12 @@ begin if updateinfo.errorType <> 0 then Exit; - if GetStr(tkw[wOpEqual], False, False) then begin OutString(Char(OpEqual)); OpType := topEqual; end else + if GetStr(tkw[wOpEqual], False, False) then begin OutString(Char(OpEqual)); OpType := topEqual; end else if GetStr(tkw[wOpNotEqual], False, False) then begin OutString(Char(OpNotEqual)); OpType := topNotEqual; end else - if GetStr(tkw[wOpEqGreat], False, False) then begin OutString(Char(OpEqGreat)); OpType := topEqGreat; end else - if GetStr(tkw[wOpEqLess], False, False) then begin OutString(Char(OpEqLess)); OpType := topEqLess; end else - if GetStr(tkw[wOpGreater], False, False) then begin OutString(Char(OpGreater)); OpType := topGreater; end else - if GetStr(tkw[wOpLess], False, False) then begin OutString(Char(OpLess)); OpType := topLess; end else + if GetStr(tkw[wOpEqGreat], False, False) then begin OutString(Char(OpEqGreat)); OpType := topEqGreat; end else + if GetStr(tkw[wOpEqLess], False, False) then begin OutString(Char(OpEqLess)); OpType := topEqLess; end else + if GetStr(tkw[wOpGreater], False, False) then begin OutString(Char(OpGreater)); OpType := topGreater; end else + if GetStr(tkw[wOpLess], False, False) then begin OutString(Char(OpLess)); OpType := topLess; end else if VarType1 <> iBool then Error(mpsExpOperator, ''); if OpType <> tOpNone then begin @@ -1415,13 +1415,13 @@ begin end; end; -Procedure TParserEngine.ParseVariable (vt : TIdentTypes); +Procedure TParserEngine.ParseVariable (VT: TIdentTypes); Begin - if vt in vnums then ParseVarNumber else - if vt = iString then ParseVarString else - if vt = iChar then ParseVarChar Else - if vt = iBool then ParseVarBoolean else - if vt = iFile then Error(mpsInStatement,''); + If VT in vNums Then ParseVarNumber Else + If VT = iString Then ParseVarString Else + If VT = iChar Then ParseVarChar Else + If VT = iBool Then ParseVarBoolean Else + If VT = iFile Then Error(mpsInStatement,''); End; Procedure TParserEngine.ParseVariableInfo (Param: Boolean; IsRec: Boolean; Var Info: TParserVarInfoRec); @@ -1503,16 +1503,16 @@ Procedure TParserEngine.ParseVariableInfo (Param: Boolean; IsRec: Boolean; Var I IdentStr := strLower(IdentStr); // separate function? - If IdentStr = tkv[iString] Then Info.vType := iString Else - If IdentStr = tkv[iChar ] Then Info.vType := iChar Else - If IdentStr = tkv[iByte ] Then Info.vType := iByte Else - If IdentStr = tkv[iShort] Then Info.vType := iShort Else - If IdentStr = tkv[iWord ] Then Info.vType := iWord Else - If IdentStr = tkv[iInteger] Then Info.vType := iInteger Else - If IdentStr = tkv[iLongInt ] Then Info.vType := iLongInt Else - If IdentStr = tkv[iReal ] Then Info.vType := iReal Else - If IdentStr = tkv[iBool ] Then Info.vType := iBool Else - If IdentStr = tkv[iFile ] Then Begin + If IdentStr = tkv[iString ] Then Info.vType := iString Else + If IdentStr = tkv[iChar ] Then Info.vType := iChar Else + If IdentStr = tkv[iByte ] Then Info.vType := iByte Else + If IdentStr = tkv[iShort ] Then Info.vType := iShort Else + If IdentStr = tkv[iWord ] Then Info.vType := iWord Else + If IdentStr = tkv[iInteger] Then Info.vType := iInteger Else + If IdentStr = tkv[iLongInt] Then Info.vType := iLongInt Else + If IdentStr = tkv[iReal ] Then Info.vType := iReal Else + If IdentStr = tkv[iBool ] Then Info.vType := iBool Else + If IdentStr = tkv[iFile ] Then Begin If IsRec Then Error(mpsSyntaxError, 'Cannot define file in record'); Info.vType := iFile; End Else Begin diff --git a/mystic/mpl_types.pas b/mystic/mpl_types.pas index b0a641f..7ca90d4 100644 --- a/mystic/mpl_types.pas +++ b/mystic/mpl_types.pas @@ -196,7 +196,8 @@ Const ':', 'function', 'array', 'case', 'of', '..', 'type', 'const', 'break', 'continue', 'uses', 'exit', - '$', 'and', 'or', 'xor', 'shl', 'shr' + '$', 'and', 'or', 'xor', + 'shl', 'shr' ); wTokensIPLC : TTokenWordType = ( @@ -215,7 +216,8 @@ Const ':', 'func', 'array', 'switch', 'of', '..', 'type', 'const', 'break', 'continue', 'uses', 'exit', - '$', '&', '|', 'xor', '<<', '>>' + '$', '&', '|', 'xor', + '<<', '>>' ); {$ENDIF}