Commit 3a153dc9 authored by Diederik van Arkel's avatar Diederik van Arkel
Browse files

Remove unused strictness annotations

parent 449c3d5a
......@@ -603,7 +603,7 @@ setCheckControlMark full id io
True -> markCheckControlItems id [1] io
False -> unmarkCheckControlItems id [1] io
doPathsDialog :: !String !Pathname !Pathname !(List Pathname) (!(List Pathname) !(PSt .l) -> (PSt .l)) (PSt .l) -> (PSt .l)
doPathsDialog :: !String !Pathname !Pathname !(List Pathname) ((List Pathname) (PSt .l) -> (PSt .l)) (PSt .l) -> (PSt .l)
doPathsDialog titlestring ap pp lo set ps
# (wid,ps) = openId ps
(okid,ps) = openId ps
......@@ -712,7 +712,7 @@ where
ps = appendExtListBoxItems lb1Id (zip3 (FullPaths full ap pp (StrictListToList lo))(repeat id)(repeat id)) ps
= ((lo,full),ps)
doCompilerOptionsDialog :: !String !CompilerOptions (!CompilerOptions !(PSt .l) -> (PSt .l)) !(PSt .l) -> (PSt .l)
doCompilerOptionsDialog :: !String !CompilerOptions (CompilerOptions (PSt .l) -> (PSt .l)) !(PSt .l) -> (PSt .l)
doCompilerOptionsDialog titlestring ini set ps
# (wid,ps) = accPIO openId ps
# (cid,ps) = accPIO openId ps
......
......@@ -6,7 +6,7 @@ import IdeState
// version A of interrupt routines
// todo: generalise and reintegrate with version B (interrupt)
:: Callback l :== !Bool !(*PSt l) -> !*PSt l
:: Callback l :== Bool (*PSt l) -> *PSt l
/* Starts an 'interruptable' function.
1st arg. The dialog id of the 'control dialog'. Closing this dialog 'terminates' the
......@@ -17,13 +17,13 @@ import IdeState
finished.
3rd arg. The program state.
*/
StartIntr :: !(!Id,!Id) !(Callback General) !*(PSt General) -> !*(PSt General)
StartIntr :: !(!Id,!Id) !(Callback General) !*(PSt General) -> *(PSt General)
/* Stops an 'interruptable' function. This function must be called when it wants to terminate.
1st arg. The dialog id of the 'control dialog'.
2nd arg. The program state.
*/
StopIntr :: !(!Id,!Id) !*(PSt .l) -> !*(PSt .l)
StopIntr :: !(!Id,!Id) !*(PSt .l) -> *(PSt .l)
/* Continues an 'interruptable' function. This function is called by an 'interruptable' function to
allow user interruption at this state of its processing.
......@@ -31,4 +31,4 @@ StopIntr :: !(!Id,!Id) !*(PSt .l) -> !*(PSt .l)
2nd arg. The continuation function.
3rd arg. The program state.
*/
ContIntr :: !(!Id,!Id) !(Callback General) !*(PSt General) -> !*(PSt General)
ContIntr :: !(!Id,!Id) !(Callback General) !*(PSt General) -> *(PSt General)
......@@ -11,9 +11,9 @@ getDialogExistence id io
# (st,io) = getDialogsStack io
= (isMember id st, io)
:: Callback l :== !Bool !(*PSt l) -> !*PSt l
:: Callback l :== Bool (*PSt l) -> *PSt l
StartIntr :: !(!Id,!Id) !(Callback General) !*(PSt General) -> !*(PSt General)
StartIntr :: !(!Id,!Id) !(Callback General) !*(PSt General) -> *(PSt General)
StartIntr (dialogId,interruptId) callback ps
# ps = setCallback callback ps
# (exists,ps) = accPIO (getDialogExistence dialogId) ps
......@@ -51,11 +51,11 @@ TriggerNoIntr interruptId noi (ls,ps)
# ps = appPIO (disableTimer interruptId) ps
= (ls,callback False ps)
StopIntr :: !(!Id,!Id) !*(PSt .l) -> !*(PSt .l)
StopIntr :: !(!Id,!Id) !*(PSt .l) -> *(PSt .l)
StopIntr (dialogId,interruptId) ps
= appPIO (closeTimer interruptId) ps
ContIntr :: !(!Id,!Id) !(Callback General) !*(PSt General) -> !*(PSt General)
ContIntr :: !(!Id,!Id) !(Callback General) !*(PSt General) -> *(PSt General)
ContIntr (dialogId,interruptId) callback ps
# ps = setCallback callback ps
= appPIO (enableTimer interruptId) ps
......@@ -73,7 +73,7 @@ getConPrefs {tfnt,tpos,tsiz,sync} =
, conswinsync = sync
}
getConWind :: !ConsWinInfo -> !Id
getConWind :: !ConsWinInfo -> Id
getConWind {ConsWinInfo | wId} = wId
getConSync {sync} = sync
......
......@@ -17,7 +17,7 @@ ew_maybe_close :: !Id !*(PSt *General) -> (Bool,*PSt *General)
err_init :: !ErrPrefs *World -> *(.ErrorInfo .c,*World)
// Initialise options from prefs
err_shut :: !(ErrorInfo .a) -> !ErrPrefs
err_shut :: !(ErrorInfo .a) -> ErrPrefs
// Initialise prefs from options
err_options :: !*(PSt *General) -> *PSt *General;
......
......@@ -534,7 +534,7 @@ err_init {err_pos, err_siz, err_forc, err_bacc, err_fname, err_fsize, err_err, e
}
= (errinfo,w)
err_shut :: !(ErrorInfo .a) -> !ErrPrefs
err_shut :: !(ErrorInfo .a) -> ErrPrefs
err_shut info
# fdef = getFontDef info.err_font
# prefs =
......@@ -556,7 +556,7 @@ err_shut info
:: MessageType = Error | Warning | Info
TypeErrorMsg :: !String -> !MessageType
TypeErrorMsg :: !String -> MessageType
TypeErrorMsg msg = type
where
msglen = size msg
......
......@@ -6,13 +6,13 @@ from IDE import :: General
// implement find commands...
sr_find :: !*(PSt *General) -> !*PSt *General
sr_find_next :: !*(PSt *General) -> !*PSt *General
sr_find_sel :: !*(PSt *General) -> !*PSt *General
sr_rep_find :: !*(PSt *General) -> !*PSt *General
sr_goto_cursor :: !*(PSt *General) -> !*PSt *General
sr_goto_line :: !*(PSt *General) -> !*PSt *General
sr_goto_selection :: !*(PSt *General) -> !*PSt *General
sr_find :: !*(PSt *General) -> *PSt *General
sr_find_next :: !*(PSt *General) -> *PSt *General
sr_find_sel :: !*(PSt *General) -> *PSt *General
sr_rep_find :: !*(PSt *General) -> *PSt *General
sr_goto_cursor :: !*(PSt *General) -> *PSt *General
sr_goto_line :: !*(PSt *General) -> *PSt *General
sr_goto_selection :: !*(PSt *General) -> *PSt *General
//-- avoid compiler warnings...
:: WorkType
......
......@@ -20,7 +20,7 @@ where
//--- search routines
sr_find :: !*(PSt *General) -> !*PSt *General
sr_find :: !*(PSt *General) -> *PSt *General
sr_find pstate // Find
# (finfo,pstate) = getFI pstate
(fId,pstate) = openId pstate
......@@ -143,7 +143,7 @@ where
, WindowClose (noLS (closeWindow fId))
]
where
tfind :: !Id !Id !Id !*(PSt *General) -> !*PSt *General
tfind :: !Id !Id !Id !*(PSt *General) -> *PSt *General
tfind dlogId findId replId pstate
# (wstate,pstate) = accPIO (getWindow dlogId) pstate
| isNothing wstate = pstate
......@@ -184,7 +184,7 @@ where
# (fi,ps) = getFI ps
= setFI {fi & fi_re = not fi.fi_re} ps
lfind :: !Id !Id !Id !Id !*(PSt *General) -> !*PSt *General
lfind :: !Id !Id !Id !Id !*(PSt *General) -> *PSt *General
lfind dlogId findId replId windId pstate
# (wstate,pstate) = accPIO (getWindow dlogId) pstate
wstate = fromJust wstate
......@@ -204,7 +204,7 @@ where
pstate = setFI fi pstate
= sr_worker windId Find fi pstate
lrepl :: !Id !Id !Id !Id !*(PSt *General) -> !*PSt *General
lrepl :: !Id !Id !Id !Id !*(PSt *General) -> *PSt *General
lrepl dlogId findId replId windId pstate
# (wstate,pstate) = accPIO (getWindow dlogId) pstate
wstate = fromJust wstate
......@@ -224,7 +224,7 @@ where
pstate = setFI fi pstate
= sr_worker windId Replace fi pstate
lrepa :: !Id !Id !Id !Id !*(PSt *General) -> !*PSt *General
lrepa :: !Id !Id !Id !Id !*(PSt *General) -> *PSt *General
lrepa dlogId findId replId windId pstate
# (wstate,pstate) = accPIO (getWindow dlogId) pstate
wstate = fromJust wstate
......@@ -277,7 +277,7 @@ where
= h+++t
// Find Again
sr_find_next :: !*(PSt *General) -> !*PSt *General
sr_find_next :: !*(PSt *General) -> *PSt *General
sr_find_next pstate
# (finfo,pstate) = getFI pstate
# (win,pstate) = accPIO getActiveWindow pstate
......@@ -291,7 +291,7 @@ sr_find_next pstate
= sr_worker win Find finfo pstate
// Worker funs
sr_worker :: !Id !WorkType !FindInfo !*(PSt *General) -> !*PSt *General
sr_worker :: !Id !WorkType !FindInfo !*(PSt *General) -> *PSt *General
sr_worker wId work_type finfo pstate
# (maybesel,pstate) = message wId msgGetSelection pstate
| isNothing maybesel
......@@ -354,7 +354,7 @@ sr_worker wId work_type finfo pstate
-> appPIO beep pstate
-> okNotice [toString (fromJust res)+++" occurences replaced."] pstate
sr_types_worker :: !WorkType !FindInfo !*(PSt *General) -> !*PSt *General
sr_types_worker :: !WorkType !FindInfo !*(PSt *General) -> *PSt *General
sr_types_worker work_type finfo pstate
# (maybesel,pstate) = type_win_message msgGetSelection pstate
| isNothing maybesel
......@@ -391,7 +391,7 @@ sr_types_worker work_type finfo pstate
// Find Selection
sr_find_sel :: !*(PSt *General) -> !*PSt *General
sr_find_sel :: !*(PSt *General) -> *PSt *General
sr_find_sel pstate
# (win,pstate) = accPIO getActiveWindow pstate
(twi,pstate) = accPLoc getTypeWinInfo pstate
......@@ -419,7 +419,7 @@ sr_find_sel pstate
// Replace & Find Again
// Rethink wanted behaviour...
sr_rep_find :: !*(PSt *General) -> !*PSt *General
sr_rep_find :: !*(PSt *General) -> *PSt *General
sr_rep_find pstate
# (win,pstate) = accPIO getActiveWindow pstate
(twi,pstate) = accPLoc getTypeWinInfo pstate
......@@ -472,7 +472,7 @@ regexp_replace_find wId finfo pstate
//--- jump to ... stuff
sr_goto_cursor :: !*(PSt *General) -> !*PSt *General
sr_goto_cursor :: !*(PSt *General) -> *PSt *General
sr_goto_cursor pstate // Goto cursor
# (win,pstate) = accPIO getActiveWindow pstate
(twi,pstate) = accPLoc getTypeWinInfo pstate
......@@ -486,7 +486,7 @@ sr_goto_cursor pstate // Goto cursor
# (_,pstate) = message win msgScrollToCursor pstate
= pstate
sr_goto_line :: !*(PSt *General) -> !*PSt *General
sr_goto_line :: !*(PSt *General) -> *PSt *General
sr_goto_line pstate
# (win,pstate) = accPIO getActiveWindow pstate
| isNothing win
......@@ -543,7 +543,7 @@ where
False -> message win (msgScrollToLine line) pstate
= pstate
sr_goto_selection :: !*(PSt *General) -> !*PSt *General
sr_goto_selection :: !*(PSt *General) -> *PSt *General
sr_goto_selection pstate
# (win,pstate) = accPIO getActiveWindow pstate
| isNothing win
......
......@@ -10,5 +10,5 @@ from IdeState import :: General
| Level2 String
| Level3 [String]
showInfo :: !.Info !*(PSt General) -> !*PSt General
closeInfo :: !*(PSt General) -> !*PSt General
showInfo :: !.Info !*(PSt General) -> *PSt General
closeInfo :: !*(PSt General) -> *PSt General
......@@ -15,7 +15,7 @@ checkDialogExistence id io
# (st,io) = getDialogsStack io
= (isMember id st,io)
showInfo :: !.Info !*(PSt General) -> !*PSt General
showInfo :: !.Info !*(PSt General) -> *PSt General
showInfo info ps
# (interact, ps) = getInteract ps
| not interact
......@@ -76,7 +76,7 @@ where
, ControlItemSpace 3 3
]
closeInfo :: !*(PSt General) -> !*PSt General
closeInfo :: !*(PSt General) -> *PSt General
closeInfo ps
# ((pr_info,_),ps) = getInterrupt ps
ps = closeWindow pr_info ps
......
This diff is collapsed.
......@@ -4,7 +4,7 @@ Global
Target: Object IO 1.2
Exec: {Application}:mmIde
CodeGen
CheckStacks: True
CheckStacks: False
CheckIndexes: True
TargetProcessor: CurrentProcessor
Application
......@@ -22,12 +22,12 @@ Global
Memory: False
MemoryMinimumHeapSize: 0
Time: True
Stack: True
Stack: False
Output
Output: NoConsole
Font: Courier
FontSize: 9
WriteStdErr: False
WriteStdErr: True
Link
LinkMethod: Static
GenerateRelocations: False
......@@ -36,17 +36,19 @@ Global
ResourceSource:
GenerateDLL: False
ExportedNames:
AddCarbResource: False
Paths
Path: {Project}
Path: {Application}:WrapDebug
Path: {Application}:Directory
Path: {Project}:Ide
Path: {Project}:Mac
Path: {Project}:Pm
Path: {Project}:Util
Path: {Project}:Ed
Path: {Project}:Mac
Path: {Project}:Util
Path: {Project}:Interfaces:LinkerInterface
Path: {Project}:Interfaces:ProverOptions
Path: {Application}:Libraries:Directory
Precompile:
Postlink:
MainModule
Name: IDE
Dir: {Project}:Ide
......@@ -69,9 +71,9 @@ MainModule
DclOpen: False
Icl
WindowPosition
X: 70
Y: 16
SizeX: 672
SizeY: 689
X: 24
Y: 12
SizeX: 762
SizeY: 676
IclOpen: False
LastModified: No 0 0 0 0 0 0
......@@ -23,7 +23,7 @@ DefaultABCOptions :: ABCOptions
:: *ABCCache
:: ModuleDate :== DateTime
AC_Init :: !ABCCache
AC_Init :: ABCCache
Combined ::
!Pathname
......
......@@ -11,8 +11,8 @@ import PmFileInfo
import UtilNewlinesFile
import PmDirCache
from PmTypes import :: LinkLibraryName, :: LinkObjFileName
from Directory import :: DateTime(..), :: Date`(..), :: Time`(..)
from PmTypes import :: LinkObjFileName, :: LinkLibraryName
from Directory import :: Date`(..), :: Time`(..)
//import RWSDebug
(->>) l r :== l
......
......@@ -48,7 +48,7 @@ where
instance fromString ListTypes
where
fromString :: {#Char} -> !ListTypes
fromString :: {#Char} -> ListTypes
fromString "NoTypes"
= NoTypes
fromString "InferredTypes"
......
......@@ -14,10 +14,10 @@ from Directory import :: DateTime, :: Date`, :: Time`
DC_Setup :: !(List Pathname) !*Files -> (!(![String],![Warn],!.DirCache),!*Files)
// Initialise directory cache
DC_Search :: !Modulename !*DirCache -> !*(!Bool,!Pathname,!DateTime,!*DirCache)
DC_Search :: !Modulename !*DirCache -> *(!Bool,!Pathname,!DateTime,!*DirCache)
// Find file in directory cache
DC_Update :: !.(String,String,DateTime) !*DirCache -> !*DirCache
DC_Update :: !.(String,String,DateTime) !*DirCache -> *DirCache
// Update directory cache
SearchDisk :: !Bool !Modulename !(List Pathname) !*Files -> ((!Bool,!Pathname),!*Files)
......
......@@ -72,12 +72,12 @@ where
getinfo {fileName,fileInfo=fi=:{pi_fileInfo=dummyname=:{lastModified,isDirectory}}}
= (isDirectory,fileName,lastModified)
DC_Update :: !.(String,String,DateTime) !*DirCache -> !*DirCache
DC_Update :: !.(String,String,DateTime) !*DirCache -> *DirCache
DC_Update (n`,p`,m`) cache
# (maxi,cache) = usize cache
= binsearch 0 maxi maxi cache
where
binsearch :: !Int !Int !Int !*DirCache -> !*DirCache
binsearch :: !Int !Int !Int !*DirCache -> *DirCache
binsearch left right max cache
| left >= right
# newcache = createArray (inc max) (n`,p`,m`)
......@@ -93,14 +93,14 @@ where
// n` > n
= binsearch (inc mid) right max cache
copy :: !Int !*DirCache !*DirCache !Int !Int -> !(!*DirCache, !*DirCache)
copy :: !Int !*DirCache !*DirCache !Int !Int -> (!*DirCache, !*DirCache)
copy num new old newbegin oldbegin
| num <= 0 = (new,old)
# (e,old) = uselect old oldbegin
# new = update new newbegin e
= copy (dec num) new old (inc newbegin) (inc oldbegin)
DC_Search :: !Modulename !*DirCache -> !*(!Bool,!Pathname,!DateTime,!*DirCache)
DC_Search :: !Modulename !*DirCache -> *(!Bool,!Pathname,!DateTime,!*DirCache)
DC_Search mod cache
# (maxi,cache) = usize cache
= binsearch 0 maxi mod cache
......
......@@ -12,10 +12,10 @@ from PmCleanSystem import :: CompileOrCheckSyntax
-> (PSt General) -> PSt General)
:: CleanupCont :==
!Pathname
!Bool
!Bool
!*(PSt *General) -> *(PSt *General)
Pathname
Bool
Bool
*(PSt *General) -> *(PSt *General)
CompileProjectModule :: // Compile or Syntax-check a single module
!CompileOrCheckSyntax
......
......@@ -111,7 +111,7 @@ GenAsmProjectModule path project setproject ps
# ps = setFICache fileinfo ps
= setproject True ok project ps
:: CleanupCont :== !Pathname !Bool !Bool !*(PSt *General) -> *(PSt *General)
:: CleanupCont :== Pathname Bool Bool *(PSt *General) -> *(PSt *General)
BringProjectUptoDate :: !Bool CleanupCont !*(PSt *General) -> *PSt *General
BringProjectUptoDate force continuation ps
......
......@@ -28,4 +28,4 @@ EnvsFileName :== "IDEEnvs"
openEnvironments :: !String !String !*env -> *([Target],*env) | FileEnv env
saveEnvironments :: !String ![Target] !*env -> *(Bool,*env) | FileEnv env
t_StdEnv :: !Target
t_StdEnv :: Target
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment