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

Remove unused strictness annotations

parent 449c3d5a
......@@ -16,7 +16,7 @@ simpleLineSearch ::
-> Maybe Selection // maybe found selection
simpleLineSearch` :: // Alternative version for Replace All
!Selection !Bool !Bool !Bool !Bool !String !*{String} -> !(!Maybe Selection,!*{String})
!Selection !Bool !Bool !Bool !Bool !String !*{String} -> (!Maybe Selection,!*{String})
regexpLineSearch ::
// regexp search
......@@ -30,7 +30,7 @@ regexpLineSearch ::
-> Maybe Selection // maybe found selection
regexpLineSearch` :: // Alternative version for Replace All
!Selection !Bool !Bool !Bool !Bool !String !*{String} -> !(!Maybe Selection,!*{String})
!Selection !Bool !Bool !Bool !Bool !String !*{String} -> (!Maybe Selection,!*{String})
regexpLineReplace ::
// regexp replace
......
......@@ -110,7 +110,7 @@ where
| s <= col` = Just (s,f)
= findb r
regexpLineSearch` :: !Selection !Bool !Bool !Bool !Bool !String !*{String} -> !(!Maybe Selection,!*{String})
regexpLineSearch` :: !Selection !Bool !Bool !Bool !Bool !String !*{String} -> (!Maybe Selection,!*{String})
regexpLineSearch` sel=:{start,end} backwards wraparound ignore_case match_words search text`
| isEmpty maybeREParserList = (Nothing,text) // "no valid search pattern"
| not (isEmpty restParsers) = (Nothing,text) // "pattern generates multiple parsers"
......@@ -243,7 +243,7 @@ where
= findIgnore` (next column )
= findIgnore` (next column)
simpleLineSearch` :: !Selection !Bool !Bool !Bool !Bool !String !*{String} -> !(!Maybe Selection,!*{String})
simpleLineSearch` :: !Selection !Bool !Bool !Bool !Bool !String !*{String} -> (!Maybe Selection,!*{String})
simpleLineSearch` sel=:{start,end} backwards wraparound ignore_case match_words search text`
| start == end = singleLineSearch` True sel text
= singleLineSearch` True {sel & end = {start & col = next start.col}} text
......
......@@ -24,8 +24,8 @@ textLength :: !Text -> Int
lastLineNr :: !Text -> LineNr
validateLineNr :: !LineNr Text -> LineNr
getLine :: !LineNr !u:Text -> !(!String, !u:Text)
getLineC :: !LineNr !u:Text -> !((!Int,!String), !u:Text)
getLine :: !LineNr !u:Text -> (!String, !u:Text)
getLineC :: !LineNr !u:Text -> ((!Int,!String), !u:Text)
getLines :: LineNr LineNr Text -> (StrictList String, Text)
//getLinesC :: LineNr LineNr Text -> (StrictList (Int,String), Text)
......@@ -34,8 +34,8 @@ removeLine :: !LineNr !Text -> Text
removeLines :: !LineNr !LineNr !Text -> Text
insertLines :: !LineNr !(StrictList String) !Text -> Text
appendLines :: !(StrictList String) !Text -> !Text
appendLines` :: !(StrictList String) !Text -> !Text
appendLines :: !(StrictList String) !Text -> Text
appendLines` :: !(StrictList String) !Text -> Text
// newText: creates a new text. A new text consists of one
// empty line.
......
......@@ -90,7 +90,7 @@ where
2 // silly DOS
1 // mac
newline
= PlatformDependant
=: PlatformDependant
"\xd\xa" // windows
"\xd" // mac
......@@ -169,7 +169,7 @@ validateLineNr lineNr text
where
lastNr = lastLineNr text
getLine :: !LineNr !u:Text -> !(!String, !u:Text)
getLine :: !LineNr !u:Text -> (!String, !u:Text)
getLine linenr text=:{nrLines, blocks}
# (_,line) = slIndex lineNr` theBlock
= ( line, text)
......@@ -181,7 +181,7 @@ where
nrSkip = lineNr / BlockSize
theBlock = blocks!!nrSkip
getLineC :: !LineNr !u:Text -> !((!Int,!String), !u:Text)
getLineC :: !LineNr !u:Text -> ((!Int,!String), !u:Text)
getLineC linenr text=:{nrLines, blocks}
# line = slIndex lineNr` theBlock
= ( line, text)
......@@ -251,7 +251,7 @@ insertLines lineNr strings text=:{ nrLines, blocks }
# (_,lines) = annotPart (dec lineNr) (lineNr + nrInsertLines) lines
= {blocks = group BlockSize lines, nrLines = nrLines + nrInsertLines}
appendLines :: !(StrictList String) !Text -> !Text
appendLines :: !(StrictList String) !Text -> Text
appendLines strings text=:{ nrLines, blocks }
# nrAppendLines = slLength strings
# before = textToStringsC text
......@@ -260,7 +260,7 @@ appendLines strings text=:{ nrLines, blocks }
# (_,lines) = annotPart (dec nrLines) (nrLines + nrAppendLines) lines
= {blocks = group BlockSize lines, nrLines = nrLines + nrAppendLines}
appendLines` :: !(StrictList String) !Text -> !Text
appendLines` :: !(StrictList String) !Text -> Text
appendLines` strings text=:{ nrLines, blocks }
# (string,strings) = case strings of
SNil -> ("",SNil)
......
......@@ -6,7 +6,7 @@ from StdPicture import :: Picture
from StdIOCommon import :: SelectState, :: UpdateState
import EdMonad
editWindowLook :: EditState SelectState !UpdateState -> (!*Picture -> *Picture)
editWindowLook :: EditState SelectState !UpdateState -> (*Picture -> *Picture)
// editWindowLook: defines the look of the editor window. This function
// is used to handle update events.
......@@ -10,7 +10,7 @@ import EdVisualText, EdVisualCursor, EdVisualLineNr, EdSelection
// editWindowLook: updating the affected areas is done by updating
// each of the rectangles.
editWindowLook :: EditState SelectState !UpdateState -> (!*Picture -> *Picture)
editWindowLook :: EditState SelectState !UpdateState -> (*Picture -> *Picture)
editWindowLook editState selectState updateState=:{ updArea, newFrame, oldFrame }
= editWindowLook`
where
......
......@@ -55,7 +55,7 @@ from EdSelection import :: Selection, :: Position, :: ColumnNr, :: LineNr
, keywordColour :: !Colour
}
DefaultSyntaxColours :: !SyntaxColours
DefaultSyntaxColours :: SyntaxColours
:: UndoInfo =
{ state :: !UndoState // undo or redo
......
......@@ -401,7 +401,7 @@ computeFontInfo font (tabSize,autoTab,showTabs,_,showSynCol) syncols pstate
, pstate
)
DefaultSyntaxColours :: !SyntaxColours
DefaultSyntaxColours :: SyntaxColours
DefaultSyntaxColours =
{ textColour = Black
, tabColour = Red
......
......@@ -99,7 +99,7 @@ tabDrawStringC point (clevel,string)
= tabDrawString` (N clevel) point strings picture
where
tabDrawString` :: !CommentLevel !Point2 !.[String] !*Picture -> !*Picture
tabDrawString` :: !CommentLevel !Point2 !.[String] !*Picture -> *Picture
// hmm, need to get if column 0 into local funs...
tabDrawString` _ _ [] picture
// #! (_,picture) = optGetPenPos picture
......@@ -128,11 +128,11 @@ where
drawC :: !.CommentLevel !.String !*Picture -> !(!.CommentLevel,!*Picture)
drawC :: !.CommentLevel !.String !*Picture -> (!.CommentLevel,!*Picture)
drawC c s pic
= drawC c pic
where
drawC :: !.CommentLevel !*Picture -> !(!.CommentLevel,!*Picture)
drawC :: !.CommentLevel !*Picture -> (!.CommentLevel,!*Picture)
drawC S pic // string literal
# pic = setPenColour stringColour pic
= dS 0 pic
......@@ -156,10 +156,10 @@ where
| s.[i] == x = True
= isStringMember x (dec i) s
funnyChars = "~@#$%^?!+-*<>\\/|&=:."
funnyChars =: "~@#$%^?!+-*<>\\/|&=:."
funnySize = 20
dL :: !.Int !.Int !*Picture -> !(!.CommentLevel,!*Picture)
dL :: !.Int !.Int !*Picture -> (!.CommentLevel,!*Picture)
dL cl i pic
| i >= l
= (N cl,pic)
......@@ -237,7 +237,7 @@ where
# pic = optDrawS r pic
= dL cl j pic
where
scankeyword :: !.String !Int -> !(!Bool,!Int)
scankeyword :: !.String !Int -> (!Bool,!Int)
scankeyword s i
# c = s.[i]
| not (isAlpha c)
......@@ -315,7 +315,7 @@ where
| funnyChar i = scanfunny (inc i)
= i
dS :: !Int !*Picture -> !(!.CommentLevel,!*Picture)
dS :: !Int !*Picture -> (!.CommentLevel,!*Picture)
dS i pic
| i >= l
= (S,pic)
......@@ -332,7 +332,7 @@ where
= dS (inc i) pic
# pic = optDrawC s.[i] pic
= dS (inc i) pic
dC :: !Int !*Picture -> !(!.CommentLevel,!*Picture)
dC :: !Int !*Picture -> (!.CommentLevel,!*Picture)
dC i pic
| i >= l
= (C,pic)
......
......@@ -9,7 +9,7 @@ import EdLineText
getTextFragment :: !Selection !Text -> (!TextFragment, !Text)
removeText :: !Selection !Text -> (Maybe Int, Text)
insertText :: !Position !TextFragment !Text -> (Maybe Int, Text)
replaceText :: !Selection !TextFragment !Text -> !Text
replaceText :: !Selection !TextFragment !Text -> Text
appendText :: !TextFragment !Text -> Text
// getSelection: returns the text fragment that is denoted
......
......@@ -72,7 +72,7 @@ insertText { col, row } strings text
where
nrOfStrings = slLength strings
replaceText :: !Selection !TextFragment !Text -> !Text
replaceText :: !Selection !TextFragment !Text -> Text
replaceText sel=:{start={col=col1,row=row1},end={col=col2,row=row2}} strings text
# (firstLine, text) = getLine row1 text
# (lastLine, text) = if (row1==row2)
......
......@@ -27,7 +27,7 @@ vRemoveText :: !Selection -> EditMonad (PSt .l) nothing
computeViewDomain :: EditMonad .env ViewDomain
getViewFrame :: EditMonad (PSt .l) ViewFrame
vResetViewDomain :: EditMonad !(PSt .l) nothing
vResetViewDomain :: EditMonad (PSt .l) nothing
vTextUpdate :: !Position Int -> EditMonad (PSt .l) nothing
vDraw :: (*Picture -> *Picture) -> EditMonad (PSt .l) a
......
......@@ -233,7 +233,7 @@ vTextUpdate position=:{row} numLines =
// vResetViewDomain changes the view domain, so that the current visual
// text fits in the window.
vResetViewDomain :: EditMonad !(PSt .l) nothing
vResetViewDomain :: EditMonad (PSt .l) nothing
vResetViewDomain = monad
where
monad (editState,pState)
......
......@@ -22,7 +22,7 @@ openEditWindow ::
SyntaxColours // syntax colours
Id // window id
[.WindowAttribute *(EditState,*PSt *b)] // initial attributes
!*(PSt *b) -> !*PSt *b | Editor b;
!*(PSt *b) -> *PSt *b | Editor b;
closeEditWindow ::
!Id // window id
......
......@@ -9,7 +9,7 @@ import ioutil
//---
openEditWindow :: Id .Title String Text !Font (Int,Bool,Bool,Bool,Bool) SyntaxColours Id [.WindowAttribute *(EditState,*PSt *b)] !*(PSt *b) -> !*PSt *b | Editor b
openEditWindow :: Id .Title String Text !Font (Int,Bool,Bool,Bool,Bool) SyntaxColours Id [.WindowAttribute *(EditState,*PSt *b)] !*(PSt *b) -> *PSt *b | Editor b
openEditWindow uId title pathName text font tabs syncols windowId atts ps
# (editorState,ps) = getEditorState ps
// generate a receiver identifier and store it in the editor state
......
......@@ -23,7 +23,7 @@ where
| c == x = True
= isStringMember x (dec i) s
funnyChars = "~@#$%^?!+-*<>\\/|&=:."
funnyChars =: "~@#$%^?!+-*<>\\/|&=:."
funnySize = 20 // =: size funnyChars?
line_size = size line
......
......@@ -550,6 +550,7 @@ msgScrollToCursor :: EditAction .l nothing
msgScrollToCursor
= vCenterCursor
msgScrollToLine :: LineNr -> EditAction General nothing
msgScrollToLine line =
vDoCursorSafe (
......@@ -702,13 +703,13 @@ msgReplaceAll fr =
vResetViewDomain >>>
result (length ulist)
where
searchFun :: !Selection !*{String} -> !(!Maybe Selection,!*{String})
searchFun :: !Selection !*{String} -> (!Maybe Selection,!*{String})
searchFun pos txt
| fr.fr_regexp
= regexpLineSearch` pos False False fr.fr_ignore_case fr.fr_match_words fr.fr_search txt
= simpleLineSearch` pos False False fr.fr_ignore_case fr.fr_match_words fr.fr_search txt
replaceFun :: !Selection !*{String} -> !(!String,!*{String})
replaceFun :: !Selection !*{String} -> (!String,!*{String})
replaceFun sel txt
| fr.fr_regexp
# (line,txt) = uselect txt sel.start.row
......@@ -717,7 +718,7 @@ where
= (nfrg,replaceText` sel nfrg txt)
= (fr.fr_replace,replaceText` sel fr.fr_replace txt)
allFun :: !Selection ![(Selection,Selection,TextFragment,TextFragment)] !*{String} -> !(![(Selection,Selection,TextFragment,TextFragment)],!*{String})
allFun :: !Selection ![(Selection,Selection,TextFragment,TextFragment)] !*{String} -> (![(Selection,Selection,TextFragment,TextFragment)],!*{String})
allFun pos acc txt
# (msel,txt) = searchFun pos txt
| isNothing msel
......@@ -729,7 +730,7 @@ where
# endpos = newCursorPos osel.start nfrg
= allFun {start=endpos,end=endpos} [(osel,{osel & end = endpos},frag,stringToStrings nfrg):acc] txt
newCursorPos :: !Position !String -> !Position
newCursorPos :: !Position !String -> Position
newCursorPos {col, row} string
= {col = col + size string, row = row }
......@@ -742,7 +743,7 @@ where
)
= abort "EdClient: ReplaceAll: fragment must be single line..."
replaceText` :: !Selection !String !*{String} -> !*{String}
replaceText` :: !Selection !String !*{String} -> *{String}
replaceText` sel=:{start={col=col1,row=row1},end={col=col2,row=row2}} string text
| row1 <> row2
= abort "EdClient: ReplaceAll: fragment must be single line..."
......
......@@ -21,8 +21,8 @@ instance Consoler General // Console
getProject :: !*(PSt *General) -> (Project,*PSt *General)
setProject :: !Project !*(PSt *General) -> *PSt *General
appProject :: (!Project -> Project) !*(PSt *General) -> *PSt *General
accProject :: (!Project -> (.a,Project)) !*(PSt *General) -> (.a,*PSt *General)
appProject :: (Project -> Project) !*(PSt *General) -> *PSt *General
accProject :: (Project -> (.a,Project)) !*(PSt *General) -> (.a,*PSt *General)
:: EditMenuLS l = // local state for the Edit menu
{ zfun :: (PSt l) -> PSt l // undo-function
......@@ -153,10 +153,10 @@ getPMR :: !*(PSt *General) -> (R2Id PLMMessage PLMReply,*PSt *General)
getTargetIds :: !*(PSt *General) -> ((!Id,!Id),!*PSt *General)
getTargets :: !*(PSt *General) -> (![Target],!*PSt *General)
setTargets :: ![Target] !*(PSt *General) -> !*PSt *General
setTargets :: ![Target] !*(PSt *General) -> *PSt *General
getCurrentTarget :: !*(PSt *General) -> (!Int,!*PSt *General)
setCurrentTarget :: !Int !*(PSt *General) -> !*PSt *General
setCurrentTarget :: !Int !*(PSt *General) -> *PSt *General
getCurrentPaths :: !*(PSt *General) -> (!(List Pathname),!*PSt *General)
getCurrentDlibs :: !*(PSt *General) -> (!(List String),!*PSt *General)
......@@ -173,13 +173,13 @@ getCurrentMeth :: !*(PSt *General) -> (!CompileMethod,!*PSt *General)
//-- error window stuff
setErrInfo :: !(ErrorInfo (PSt *General)) !*(PSt *General) -> !*PSt *General
setErrInfo :: !(ErrorInfo (PSt *General)) !*(PSt *General) -> *PSt *General
getErrInfo :: !*(PSt *General) -> (!ErrorInfo (PSt *General),!*PSt *General)
//-- project window stuff
getPWI :: !*(PSt *General) -> (!ExtListBoxId (PSt General),!*PSt *General)
setPWI :: !(ExtListBoxId (PSt General)) !*(PSt *General) -> !*PSt *General
setPWI :: !(ExtListBoxId (PSt General)) !*(PSt *General) -> *PSt *General
getPWW :: !*(PSt *General) -> (!Id,!*PSt *General)
getPWX :: !*(PSt *General) -> (!FlexId,!*PSt *General)
getPWM :: !*(PSt *General) -> (!FlexId,!*PSt *General)
......@@ -187,17 +187,17 @@ getPWM :: !*(PSt *General) -> (!FlexId,!*PSt *General)
//-- search stuff
getFBI :: !*(PSt *General) -> (!FindBoxInfo *(PSt *General),!*PSt *General)
setFBI :: !(FindBoxInfo *(PSt *General)) !*(PSt *General) -> !*PSt *General
setFBI :: !(FindBoxInfo *(PSt *General)) !*(PSt *General) -> *PSt *General
//-- find stuff
getFI :: !*(PSt *General) -> (!FindInfo,!*PSt *General)
setFI :: !FindInfo !*(PSt *General) -> !*PSt *General
setFI :: !FindInfo !*(PSt *General) -> *PSt *General
//-- project path
getPath :: !*(PSt *General) -> (!Pathname,!*PSt *General)
setPath :: !Pathname !*(PSt *General) -> !*PSt *General
setPath :: !Pathname !*(PSt *General) -> *PSt *General
//-- startup path
......@@ -211,19 +211,19 @@ getInterText :: !*(PSt *General) -> (!(Id,Id,[Id]),!*PSt *General)
//-- print setup stuff
getPrintSetup :: !*(PSt *General) -> (!PrintSetup,!*PSt *General)
setPrintSetup :: !PrintSetup !*(PSt *General) -> !*PSt *General
setPrintSetup :: !PrintSetup !*(PSt *General) -> *PSt *General
//-- flexible prefixes
getPrefix :: !*(PSt *General) -> (![String],!*PSt *General)
setPrefix :: !String !*(PSt *General) -> !*PSt *General
setPrefix :: !String !*(PSt *General) -> *PSt *General
//-- boolean that indicates if user interaction is allowed
getInteract :: !*(PSt *General) -> (!Bool,!*PSt *General)
setInteract :: !Bool !*(PSt *General) -> !*PSt *General
setInteract :: !Bool !*(PSt *General) -> *PSt *General
//-- log functions for batch build
writeLog :: !String !*(PSt *General) -> !*PSt *General
abortLog :: !Bool !String !*(PSt *General) -> !*PSt *General
writeLog :: !String !*(PSt *General) -> *PSt *General
abortLog :: !Bool !String !*(PSt *General) -> *PSt *General
......@@ -37,7 +37,7 @@ import flextextcontrol, ioutil, UtilStrictLists
,mn_ids :: !MenuIds
,callback :: !Bool !(PSt General) -> (PSt General)
,callback :: Bool (PSt General) -> (PSt General)
,abc_cache :: !*(Maybe ABCCache)
,fi_cache :: !(Maybe FileInfoCache)
......@@ -56,10 +56,10 @@ getProject ps = accPLoc (\l=:{project}->(project,l)) ps
setProject :: !Project !*(PSt *General) -> *(PSt *General)
setProject prj ps = appPLoc (\l->{l & project = prj}) ps
appProject :: (!Project -> Project) !*(PSt *General) -> *(PSt *General)
appProject :: (Project -> Project) !*(PSt *General) -> *(PSt *General)
appProject f ps = appPLoc (\l=:{project}->{l & project = f project}) ps
accProject :: (!Project -> (.a,Project)) !*(PSt *General) -> (.a,*(PSt *General))
accProject :: (Project -> (.a,Project)) !*(PSt *General) -> (.a,*(PSt *General))
accProject f ps
# (prj,ps) = ps!ls.project
# (res,prj) = f prj
......@@ -323,10 +323,10 @@ getTargetIds ps = accPLoc (\p=:{tg_menuid,tg_radioid}->((tg_menuid,tg_radioid),p
getFBI :: !*(PSt *General) -> (!FindBoxInfo *(PSt *General),!*PSt *General)
getFBI ps = accPLoc (\p=:{fb_info}->(fb_info,p)) ps
setFBI :: !(FindBoxInfo *(PSt *General)) !*(PSt *General) -> !*PSt *General
setFBI :: !(FindBoxInfo *(PSt *General)) !*(PSt *General) -> *PSt *General
setFBI ts ps = appPLoc (\p->{p & fb_info = ts}) ps
setErrInfo :: !(ErrorInfo (PSt *General)) !*(PSt *General) -> !*PSt *General
setErrInfo :: !(ErrorInfo (PSt *General)) !*(PSt *General) -> *PSt *General
setErrInfo ei ps = appPLoc (\p->{p & er_info = ei}) ps
getErrInfo :: !*(PSt *General) -> (!(ErrorInfo (PSt *General)),!*PSt *General)
......@@ -335,7 +335,7 @@ getErrInfo ps = accPLoc (\p=:{er_info}->(er_info,p)) ps
getPWI :: !*(PSt *General) -> (!ExtListBoxId (PSt General),!*PSt *General)
getPWI ps = accPLoc (\p=:{pr_list}->(pr_list,p)) ps
setPWI :: !(ExtListBoxId (PSt General)) !*(PSt *General) -> !*PSt *General
setPWI :: !(ExtListBoxId (PSt General)) !*(PSt *General) -> *PSt *General
setPWI ei ps = appPLoc (\p->{p & pr_list = ei}) ps
getPWW :: !*(PSt *General) -> (!Id,!*PSt *General)
......@@ -350,13 +350,13 @@ getPWM ps = accPLoc (\p=:{pr_mmid}->(pr_mmid,p)) ps
getFI :: !*(PSt *General) -> (!FindInfo,!*PSt *General)
getFI ps = accPLoc (\p=:{ed_find}->(ed_find,p)) ps
setFI :: !FindInfo !*(PSt *General) -> !*PSt *General
setFI :: !FindInfo !*(PSt *General) -> *PSt *General
setFI ei ps = appPLoc (\p->{p & ed_find = ei}) ps
getPath :: !*(PSt *General) -> (!Pathname,!*PSt *General)
getPath ps = accPLoc (\p=:{General | pr_path}->(pr_path,p)) ps
setPath :: !Pathname !*(PSt *General) -> !*PSt *General
setPath :: !Pathname !*(PSt *General) -> *PSt *General
setPath ts ps = appPLoc (\p->{General | p & pr_path = ts}) ps
getStup :: !*(PSt *General) -> (!Pathname,!*PSt *General)
......@@ -371,13 +371,13 @@ getInterText ps = accPLoc (\p=:{pr_text1,pr_text2,pr_text3}->((pr_text1,pr_text2
getTargets :: !*(PSt *General) -> (![Target],!*PSt *General)
getTargets ps = accPLoc (\p=:{pm_targets}->(pm_targets,p)) ps
setTargets :: ![Target] !*(PSt *General) -> !*PSt *General
setTargets :: ![Target] !*(PSt *General) -> *PSt *General
setTargets ts ps = appPLoc (\p->{p & pm_targets = ts}) ps
getCurrentTarget :: !*(PSt *General) -> (!Int,!*PSt *General)
getCurrentTarget ps = accPLoc (\p=:{pm_curtarg}->(pm_curtarg,p)) ps
setCurrentTarget :: !Int !*(PSt *General) -> !*PSt *General
setCurrentTarget :: !Int !*(PSt *General) -> *PSt *General
setCurrentTarget tg ps
= appPLoc (\p->{p & pm_curtarg = tg}) ps
......@@ -456,13 +456,13 @@ where
getPrintSetup :: !*(PSt *General) -> (!PrintSetup,!*PSt *General)
getPrintSetup ps = accPLoc (\p=:{print_setup}->(print_setup,p)) ps
setPrintSetup :: !PrintSetup !*(PSt *General) -> !*PSt *General
setPrintSetup :: !PrintSetup !*(PSt *General) -> *PSt *General
setPrintSetup s ps = appPLoc (\p->{p & print_setup = s}) ps
getPrefix :: !*(PSt *General) -> (![String],!*PSt *General)
getPrefix ps = accPLoc (\p=:{prefix}->(prefix,p)) ps
setPrefix :: !String !*(PSt *General) -> !*PSt *General
setPrefix :: !String !*(PSt *General) -> *PSt *General
setPrefix s ps = appPLoc (\p=:{prefix}->{p & prefix = removeDup [s:prefix]}) ps
//-- batch build support
......@@ -473,15 +473,15 @@ import logfile, set_return_code
getInteract :: !*(PSt *General) -> (!Bool,!*PSt *General)
getInteract ps = accPLoc (\p=:{interact}->(interact,p)) ps
setInteract :: !Bool !*(PSt *General) -> !*PSt *General
setInteract :: !Bool !*(PSt *General) -> *PSt *General
setInteract interact ps = appPLoc (\p=:{interact}->{p & interact = interact}) ps
writeLog :: !String !*(PSt *General) -> !*PSt *General
writeLog :: !String !*(PSt *General) -> *PSt *General
writeLog message ps
= appPLoc (\ls=:{logfile} -> {ls & logfile = writeLogfile message logfile}) ps
abortLog :: !Bool !String !*(PSt *General) -> !*PSt *General
abortLog :: !Bool !String !*(PSt *General) -> *PSt *General
abortLog flag message ps
# ps = case message of
"" -> ps
......
......@@ -11,11 +11,11 @@ doPathsDialog :: // Display a Paths dialogue
!Pathname // Application path
!Pathname // Project path
!(List Pathname) // List of paths
(!(List Pathname) !(PSt .l) -> (PSt .l)) // Save paths function
((List Pathname) (PSt .l) -> (PSt .l)) // Save paths function
(PSt .l) -> (PSt .l)
doCompilerOptionsDialog :: // Display Compiler Options dialogue
!String // Dialogue title string
!CompilerOptions // Compiler options
(!CompilerOptions !(PSt .l) -> (PSt .l)) // Save options function
(CompilerOptions (PSt .l) -> (PSt .l)) // Save options function
!(PSt .l) -> (PSt .l)
......@@ -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