Commit ed4bed91 authored by Ronny Wichers Schreur's avatar Ronny Wichers Schreur

Removed useless strictness annotations.

parent b398cc62
...@@ -3,7 +3,7 @@ definition module cursorInternal; ...@@ -3,7 +3,7 @@ definition module cursorInternal;
import ioState,xtypes,deltaIOSystem; import ioState,xtypes,deltaIOSystem;
SetWidgetCursor :: !Widget !CursorShape -> !Widget; SetWidgetCursor :: !Widget !CursorShape -> Widget;
SetGlobalCursor :: !CursorShape !(IOState s) -> IOState s; SetGlobalCursor :: !CursorShape !(IOState s) -> IOState s;
ResetCursor :: !(IOState s) -> IOState s; ResetCursor :: !(IOState s) -> IOState s;
...@@ -4,7 +4,7 @@ import xtypes,xcursor,deltaIOSystem; ...@@ -4,7 +4,7 @@ import xtypes,xcursor,deltaIOSystem;
import ioState,windowDevice; import ioState,windowDevice;
SetWidgetCursor :: !Widget !CursorShape -> !Widget; SetWidgetCursor :: !Widget !CursorShape -> Widget;
SetWidgetCursor w StandardCursor = XSetWidgetCursor XStandardCursor w; SetWidgetCursor w StandardCursor = XSetWidgetCursor XStandardCursor w;
SetWidgetCursor w BusyCursor = XSetWidgetCursor XBusyCursor w; SetWidgetCursor w BusyCursor = XSetWidgetCursor XBusyCursor w;
SetWidgetCursor w IBeamCursor = XSetWidgetCursor XIBeamCursor w; SetWidgetCursor w IBeamCursor = XSetWidgetCursor XIBeamCursor w;
......
...@@ -234,7 +234,7 @@ SelNewItem nr y lnht index defid wid state ...@@ -234,7 +234,7 @@ SelNewItem nr y lnht index defid wid state
newst=: SetAction Selected (SetDefltIndex index state); newst=: SetAction Selected (SetDefltIndex index state);
}; };
UnSelOldItem :: !Int !Int !Int !Int !Int !Int !String ![DrawFunction] -> ![DrawFunction]; UnSelOldItem :: !Int !Int !Int !Int !Int !Int !String ![DrawFunction] -> [DrawFunction];
UnSelOldItem nr y lnht index defid wid state draws UnSelOldItem nr y lnht index defid wid state draws
| nr == 0 || no_more = draws; | nr == 0 || no_more = draws;
| index == defid = [SelectItem wid y lnht : draws]; | index == defid = [SelectItem wid y lnht : draws];
...@@ -415,7 +415,7 @@ GetNrVis state = toInt (state.[NrVisI]); ...@@ -415,7 +415,7 @@ GetNrVis state = toInt (state.[NrVisI]);
GetWidth :: !String -> Int; GetWidth :: !String -> Int;
GetWidth state = GetNrFromState WidthI state; GetWidth state = GetNrFromState WidthI state;
SetWidth :: !Int !String -> !String; SetWidth :: !Int !String -> String;
SetWidth wid state = SetNrInState WidthI wid state; SetWidth wid state = SetNrInState WidthI wid state;
GetFirstIndex :: !String -> Int; GetFirstIndex :: !String -> Int;
...@@ -437,7 +437,7 @@ GetNrFromState index state = toInt c0 + 256 * toInt c1 ; ...@@ -437,7 +437,7 @@ GetNrFromState index state = toInt c0 + 256 * toInt c1 ;
c1=: state.[inc index]; c1=: state.[inc index];
}; };
SetNrInState :: !Int !Int !String -> !String; SetNrInState :: !Int !Int !String -> String;
SetNrInState index nr state = (state := (index, c0)) := (inc index, c1); SetNrInState index nr state = (state := (index, c0)) := (inc index, c1);
where { where {
c0=: toChar (nr mod 256); c0=: toChar (nr mod 256);
......
...@@ -252,7 +252,7 @@ DisableMenuItems :: ![MenuItemId] !(IOState state) -> IOState state; ...@@ -252,7 +252,7 @@ DisableMenuItems :: ![MenuItemId] !(IOState state) -> IOState state;
DisableMenuItems item_ids io_state DisableMenuItems item_ids io_state
= ChangeMenuItems item_ids io_state (SetItemAbility Unable); = ChangeMenuItems item_ids io_state (SetItemAbility Unable);
SetItemAbility :: !SelectState !XHandle -> !XHandle; SetItemAbility :: !SelectState !XHandle -> XHandle;
SetItemAbility able (id,w) #! SetItemAbility able (id,w) #!
strict1=strict1; strict1=strict1;
= =
...@@ -270,7 +270,7 @@ UnmarkMenuItems :: ![MenuItemId] !(IOState state) -> IOState state; ...@@ -270,7 +270,7 @@ UnmarkMenuItems :: ![MenuItemId] !(IOState state) -> IOState state;
UnmarkMenuItems item_ids io_state UnmarkMenuItems item_ids io_state
= ChangeMenuItems item_ids io_state (SetItemMark NoMark); = ChangeMenuItems item_ids io_state (SetItemMark NoMark);
SetItemMark :: !MarkState !XHandle -> !XHandle; SetItemMark :: !MarkState !XHandle -> XHandle;
SetItemMark mark (id,w) #! SetItemMark mark (id,w) #!
strict1=strict1; strict1=strict1;
= =
......
...@@ -13,7 +13,7 @@ from dialogDef import :: DialogHandle (DialHandle), :: DialogMode (Modal, Modele ...@@ -13,7 +13,7 @@ from dialogDef import :: DialogHandle (DialHandle), :: DialogMode (Modal, Modele
:: Maybe a = Nothing | Just a; :: Maybe a = Nothing | Just a;
:: * IOState * s :== (![DeviceSystemState s], !EVENTS, !*Maybe !*World); :: * IOState * s :== (![DeviceSystemState s], !EVENTS, !*Maybe *World);
:: * EVENTS :== Int; :: * EVENTS :== Int;
:: DeviceSystemState *s :: DeviceSystemState *s
......
...@@ -13,10 +13,10 @@ MenuFunctions :: DeviceFunctions state; ...@@ -13,10 +13,10 @@ MenuFunctions :: DeviceFunctions state;
// Creation and allocation. // Creation and allocation.
InsertInGroup :: !MenuItemGroupId !Int ![MenuElement s (IOState s)] InsertInGroup :: !MenuItemGroupId !Int ![MenuElement s (IOState s)]
!(DeviceSystemState s) -> !DeviceSystemState s; !(DeviceSystemState s) -> DeviceSystemState s;
DelFromGroupIndex :: !MenuItemGroupId ![Int] !(DeviceSystemState s) DelFromGroupIndex :: !MenuItemGroupId ![Int] !(DeviceSystemState s)
-> DeviceSystemState s; -> DeviceSystemState s;
DelFromGroups :: ![MenuItemId] !(DeviceSystemState s) -> !DeviceSystemState s; DelFromGroups :: ![MenuItemId] !(DeviceSystemState s) -> DeviceSystemState s;
// Controlling the Appearance of Items // Controlling the Appearance of Items
CheckXWidget :: !Widget !MarkState -> Widget; CheckXWidget :: !Widget !MarkState -> Widget;
...@@ -25,4 +25,4 @@ SetMenuAbility :: !Widget !SelectState -> Widget; ...@@ -25,4 +25,4 @@ SetMenuAbility :: !Widget !SelectState -> Widget;
// general // general
IdListContainsId :: ![Int] !Int -> Bool; IdListContainsId :: ![Int] !Int -> Bool;
AddKey :: !KeyShortcut ![KeyShortcut] -> ![KeyShortcut]; AddKey :: !KeyShortcut ![KeyShortcut] -> [KeyShortcut];
...@@ -368,7 +368,7 @@ IsGroupItem MenuSeparator = True; ...@@ -368,7 +368,7 @@ IsGroupItem MenuSeparator = True;
IsGroupItem item = False; IsGroupItem item = False;
InsertInGroup :: !MenuItemGroupId !Int ![MenuElement s (IOState s)] InsertInGroup :: !MenuItemGroupId !Int ![MenuElement s (IOState s)]
!(DeviceSystemState s) -> !DeviceSystemState s; !(DeviceSystemState s) -> DeviceSystemState s;
InsertInGroup id index item (MenuSystemState w (keys, menu_specs, able)) InsertInGroup id index item (MenuSystemState w (keys, menu_specs, able))
#! #!
strict1=InsertInGroup` id index item menu_specs keys; strict1=InsertInGroup` id index item menu_specs keys;
...@@ -536,7 +536,7 @@ DelFromThisGroup index indexes [item : items] ...@@ -536,7 +536,7 @@ DelFromThisGroup index indexes [item : items]
}; };
DelFromThisGroup index indexes items = items; DelFromThisGroup index indexes items = items;
DelFromGroups :: ![MenuItemId] !(DeviceSystemState s) -> !DeviceSystemState s; DelFromGroups :: ![MenuItemId] !(DeviceSystemState s) -> DeviceSystemState s;
DelFromGroups ids (MenuSystemState w (keys, menuhandles, able)) DelFromGroups ids (MenuSystemState w (keys, menuhandles, able))
#! #!
strict1=strict1; strict1=strict1;
...@@ -752,7 +752,7 @@ DisposeMenuSystemState (MenuSystemState w handles) ...@@ -752,7 +752,7 @@ DisposeMenuSystemState (MenuSystemState w handles)
ClearMenuSystem :: !(DeviceSystemState s) -> DeviceSystemState s; ClearMenuSystem :: !(DeviceSystemState s) -> DeviceSystemState s;
ClearMenuSystem h=:(MenuSystemState w handles) = Evaluate_2 h (HideMenuX w); ClearMenuSystem h=:(MenuSystemState w handles) = Evaluate_2 h (HideMenuX w);
DrawMenuSystem :: !(DeviceSystemState s) -> !DeviceSystemState s; DrawMenuSystem :: !(DeviceSystemState s) -> DeviceSystemState s;
DrawMenuSystem h=:(MenuSystemState w handles) = Evaluate_2 h (ShowMenuX w); DrawMenuSystem h=:(MenuSystemState w handles) = Evaluate_2 h (ShowMenuX w);
...@@ -762,7 +762,7 @@ InstallKeyShortcut :: !Widget !KeyShortcut -> Widget; ...@@ -762,7 +762,7 @@ InstallKeyShortcut :: !Widget !KeyShortcut -> Widget;
InstallKeyShortcut w (Key c) = InstallShortcut w (toString c); InstallKeyShortcut w (Key c) = InstallShortcut w (toString c);
InstallKeyShortcut w key = w; InstallKeyShortcut w key = w;
AddKey :: !KeyShortcut ![KeyShortcut] -> ![KeyShortcut]; AddKey :: !KeyShortcut ![KeyShortcut] -> [KeyShortcut];
AddKey NoKey keys = keys; AddKey NoKey keys = keys;
AddKey key keys = [key : keys]; AddKey key keys = [key : keys];
......
...@@ -448,7 +448,7 @@ GetNrVis state = toInt (state.[NrVisI]); ...@@ -448,7 +448,7 @@ GetNrVis state = toInt (state.[NrVisI]);
GetWidth :: !String -> Int; GetWidth :: !String -> Int;
GetWidth state = GetNrFromState WidthI state; GetWidth state = GetNrFromState WidthI state;
SetWidth :: !Int !String -> !String; SetWidth :: !Int !String -> String;
SetWidth width state = SetNrInState WidthI width state; SetWidth width state = SetNrInState WidthI width state;
GetFirstIndex :: !String -> Int; GetFirstIndex :: !String -> Int;
...@@ -471,7 +471,7 @@ GetNrFromState index state ...@@ -471,7 +471,7 @@ GetNrFromState index state
c1 = state.[inc index]; c1 = state.[inc index];
}; };
SetNrInState :: !Int !Int !String -> !String; SetNrInState :: !Int !Int !String -> String;
SetNrInState index nr state SetNrInState index nr state
= (state := (index, c0)) := (inc index, c1); = (state := (index, c0)) := (inc index, c1);
where { where {
......
...@@ -151,7 +151,7 @@ WindowDeviceNotEmpty device = True; ...@@ -151,7 +151,7 @@ WindowDeviceNotEmpty device = True;
/* Handling all window I/O. /* Handling all window I/O.
First we check whether it is a window event and next what window event. First we check whether it is a window event and next what window event.
*/ */
WindowIO :: !Event !*s (!IOState *s) -> (!Bool, !*s, !IOState *s); WindowIO :: !Event !*s !(IOState *s) -> (!Bool, !*s, !IOState *s);
WindowIO (w, XWindowDevice, e) s io_state WindowIO (w, XWindowDevice, e) s io_state
#! #!
strict1=GetXWindowEvent e; strict1=GetXWindowEvent e;
......
...@@ -19,7 +19,7 @@ XSetEditText :: !Int !{#Char} -> Int; ...@@ -19,7 +19,7 @@ XSetEditText :: !Int !{#Char} -> Int;
XSetStaticText :: !Int !{#Char} -> Int; XSetStaticText :: !Int !{#Char} -> Int;
XGetMark :: !Int -> Int; XGetMark :: !Int -> Int;
XPressRadioWidget :: !Int !{#Char} -> Int; XPressRadioWidget :: !Int !{#Char} -> Int;
GetXDialogEvent :: !Int -> !(!Int,!Int); GetXDialogEvent :: !Int -> (!Int,!Int);
XPopupModal :: !Int -> Int; XPopupModal :: !Int -> Int;
XPopupModeless :: !Int -> Int; XPopupModeless :: !Int -> Int;
XCreateNotice :: !{#Char} -> Int; XCreateNotice :: !{#Char} -> Int;
...@@ -27,7 +27,7 @@ XCreateAboutDialog :: !Int !Int !Int !Int !Int !{#Char} -> Int; ...@@ -27,7 +27,7 @@ XCreateAboutDialog :: !Int !Int !Int !Int !Int !{#Char} -> Int;
XCreateNoticeButton :: !Int !{#Char} !Int -> Int; XCreateNoticeButton :: !Int !{#Char} !Int -> Int;
XHandleNotice :: !Int -> Int; XHandleNotice :: !Int -> Int;
XBeep :: !Int -> Int; XBeep :: !Int -> Int;
XGetCurrentRect :: !Int -> !(!Int,!Int,!Int,!Int); XGetCurrentRect :: !Int -> (!Int,!Int,!Int,!Int);
XRepositionWidget :: !Int !Int !Int !Int !Int -> Int; XRepositionWidget :: !Int !Int !Int !Int !Int -> Int;
XGetFatherWidth :: !Int -> Int; XGetFatherWidth :: !Int -> Int;
XSetDialogMargins :: !Int !Int !Int -> Int; XSetDialogMargins :: !Int !Int !Int -> Int;
......
...@@ -152,7 +152,7 @@ XPressRadioWidget _ _ ...@@ -152,7 +152,7 @@ XPressRadioWidget _ _
.end .end
}; };
GetXDialogEvent :: !Int -> !(!Int,!Int); GetXDialogEvent :: !Int -> (!Int,!Int);
GetXDialogEvent _ GetXDialogEvent _
= code { = code {
.inline GetXDialogEvent .inline GetXDialogEvent
...@@ -216,7 +216,7 @@ XBeep _ ...@@ -216,7 +216,7 @@ XBeep _
.end .end
}; };
XGetCurrentRect :: !Int -> !(!Int,!Int,!Int,!Int); XGetCurrentRect :: !Int -> (!Int,!Int,!Int,!Int);
XGetCurrentRect _ XGetCurrentRect _
= code { = code {
.inline XGetCurrentRect .inline XGetCurrentRect
......
...@@ -54,9 +54,9 @@ XAboutHelp :== 42; ...@@ -54,9 +54,9 @@ XAboutHelp :== 42;
:: XDevice :== Int; :: XDevice :== Int;
:: XEvent :== Int; :: XEvent :== Int;
:: Event :== (Widget,XDevice,XEvent); :: Event :== (Widget,XDevice,XEvent);
:: MouseEvent :== !(!Int,!Int,!Int,!Int,!Int,!Int,!Int); :: MouseEvent :== (!Int,!Int,!Int,!Int,!Int,!Int,!Int);
:: KeyEvent :== !(!Int,!Int,!Int,!Int,!Int,!Int); :: KeyEvent :== (!Int,!Int,!Int,!Int,!Int,!Int);
:: NullEvent :== !(!Int,!Int,!Int); :: NullEvent :== (!Int,!Int,!Int);
:: DialogEvent :== (!Int, !Widget); :: DialogEvent :== (!Int, !Widget);
......
...@@ -55,9 +55,9 @@ XAboutHelp :== 42; ...@@ -55,9 +55,9 @@ XAboutHelp :== 42;
:: XDevice :== Int; :: XDevice :== Int;
:: XEvent :== Int; :: XEvent :== Int;
:: Event :== (Widget,XDevice,XEvent); :: Event :== (Widget,XDevice,XEvent);
:: MouseEvent :== !(!Int,!Int,!Int,!Int,!Int,!Int,!Int); :: MouseEvent :== (!Int,!Int,!Int,!Int,!Int,!Int,!Int);
:: KeyEvent :== !(!Int,!Int,!Int,!Int,!Int,!Int); :: KeyEvent :== (!Int,!Int,!Int,!Int,!Int,!Int);
:: NullEvent :== !(!Int,!Int,!Int); :: NullEvent :== (!Int,!Int,!Int);
:: DialogEvent :== (!Int, !Widget); :: DialogEvent :== (!Int, !Widget);
......
system module xfileselect; system module xfileselect;
XSelectInputFile :: !Int -> !(!Int,!{#Char}); XSelectInputFile :: !Int -> (!Int,!{#Char});
XSelectOutputFile :: !{#Char} !{#Char} -> !(!Int,!{#Char}); XSelectOutputFile :: !{#Char} !{#Char} -> (!Int,!{#Char});
implementation module xfileselect; implementation module xfileselect;
XSelectInputFile :: !Int -> !(!Int,!{#Char}); XSelectInputFile :: !Int -> (!Int,!{#Char});
XSelectInputFile _ XSelectInputFile _
= code { = code {
.inline XSelectInputFile .inline XSelectInputFile
...@@ -8,7 +8,7 @@ XSelectInputFile _ ...@@ -8,7 +8,7 @@ XSelectInputFile _
.end .end
}; };
XSelectOutputFile :: !{#Char} !{#Char} -> !(!Int,!{#Char}); XSelectOutputFile :: !{#Char} !{#Char} -> (!Int,!{#Char});
XSelectOutputFile _ _ XSelectOutputFile _ _
= code { = code {
.inline XSelectOutputFile .inline XSelectOutputFile
......
...@@ -6,5 +6,5 @@ CloseToplevelX :: !Int -> Int; ...@@ -6,5 +6,5 @@ CloseToplevelX :: !Int -> Int;
OpenToplevelX :: !Int -> Int; OpenToplevelX :: !Int -> Int;
ShowToplevelX :: !Int -> Int; ShowToplevelX :: !Int -> Int;
HideToplevelX :: !Int -> Int; HideToplevelX :: !Int -> Int;
CatchXWidget :: !Int -> !(!Int,!Int); CatchXWidget :: !Int -> (!Int,!Int);
DestroyWidget :: !Int -> Int; DestroyWidget :: !Int -> Int;
...@@ -48,7 +48,7 @@ HideToplevelX _ ...@@ -48,7 +48,7 @@ HideToplevelX _
.end .end
}; };
CatchXWidget :: !Int -> !(!Int,!Int); CatchXWidget :: !Int -> (!Int,!Int);
CatchXWidget _ CatchXWidget _
= code { = code {
.inline CatchXWidget .inline CatchXWidget
......
...@@ -13,7 +13,7 @@ SetWidgetTitle :: !Int !{#Char} -> Int; ...@@ -13,7 +13,7 @@ SetWidgetTitle :: !Int !{#Char} -> Int;
InstallShortcut :: !Int !{#Char} -> Int; InstallShortcut :: !Int !{#Char} -> Int;
HideMenuX :: !Int -> Int; HideMenuX :: !Int -> Int;
ShowMenuX :: !Int -> Int; ShowMenuX :: !Int -> Int;
GetItemInfo :: !Int -> !(!Int,!Int,!{#Char},!{#Char}); GetItemInfo :: !Int -> (!Int,!Int,!{#Char},!{#Char});
GetSubmenuInfo :: !Int -> !(!{#Char},!Int); GetSubmenuInfo :: !Int -> (!{#Char},!Int);
DestroyItemWidget :: !Int -> Int; DestroyItemWidget :: !Int -> Int;
DestroyMenu :: !Int -> Int; DestroyMenu :: !Int -> Int;
...@@ -104,7 +104,7 @@ ShowMenuX _ ...@@ -104,7 +104,7 @@ ShowMenuX _
.end .end
}; };
GetItemInfo :: !Int -> !(!Int,!Int,!{#Char},!{#Char}); GetItemInfo :: !Int -> (!Int,!Int,!{#Char},!{#Char});
GetItemInfo _ GetItemInfo _
= code { = code {
.inline GetItemInfo .inline GetItemInfo
...@@ -112,7 +112,7 @@ GetItemInfo _ ...@@ -112,7 +112,7 @@ GetItemInfo _
.end .end
}; };
GetSubmenuInfo :: !Int -> !(!{#Char},!Int); GetSubmenuInfo :: !Int -> (!{#Char},!Int);
GetSubmenuInfo _ GetSubmenuInfo _
= code { = code {
.inline GetSubmenuInfo .inline GetSubmenuInfo
......
...@@ -4,7 +4,7 @@ StartXDrawing :: !Int -> Int; ...@@ -4,7 +4,7 @@ StartXDrawing :: !Int -> Int;
EndXDrawing :: !Int -> Int; EndXDrawing :: !Int -> Int;
HidePenX :: !Int -> Int; HidePenX :: !Int -> Int;
ShowPenX :: !Int -> Int; ShowPenX :: !Int -> Int;
GetPenX :: !Int -> !(!Int,!Int); GetPenX :: !Int -> (!Int,!Int);
PenSizeX :: !Int !Int !Int -> Int; PenSizeX :: !Int !Int !Int -> Int;
PenModeX :: !Int !Int -> Int; PenModeX :: !Int !Int -> Int;
PenPatternX :: !Int !Int -> Int; PenPatternX :: !Int !Int -> Int;
...@@ -48,9 +48,9 @@ ErasePolygonX :: !Int !Int !Int !Int !Int -> Int; ...@@ -48,9 +48,9 @@ ErasePolygonX :: !Int !Int !Int !Int !Int -> Int;
InvertPolygonX :: !Int !Int !Int !Int !Int -> Int; InvertPolygonX :: !Int !Int !Int !Int !Int -> Int;
GetNumberOfFontsX :: !Int -> Int; GetNumberOfFontsX :: !Int -> Int;
GetFontNameX :: !Int -> {#Char}; GetFontNameX :: !Int -> {#Char};
GetFontInfoX :: !Int -> !(!Int,!Int,!Int,!Int,!Int); GetFontInfoX :: !Int -> (!Int,!Int,!Int,!Int,!Int);
GetFontFontInfoX :: !Int -> !(!Int,!Int,!Int,!Int); GetFontFontInfoX :: !Int -> (!Int,!Int,!Int,!Int);
GetStringWidthX :: !Int !{#Char} -> !(!Int,!Int); GetStringWidthX :: !Int !{#Char} -> (!Int,!Int);
GetFontStringWidthX :: !Int !{#Char} -> Int; GetFontStringWidthX :: !Int !{#Char} -> Int;
SetFontX :: !Int !Int !{#Char} !{#Char} !{#Char} -> Int; SetFontX :: !Int !Int !{#Char} !{#Char} !{#Char} -> Int;
SetFontNameX :: !Int !{#Char} -> Int; SetFontNameX :: !Int !{#Char} -> Int;
...@@ -58,6 +58,6 @@ SetStyleX :: !Int !{#Char} -> Int; ...@@ -58,6 +58,6 @@ SetStyleX :: !Int !{#Char} -> Int;
SetSizeX :: !Int !{#Char} -> Int; SetSizeX :: !Int !{#Char} -> Int;
SelectDefaultFontX :: !Int -> Int; SelectDefaultFontX :: !Int -> Int;
SelectFontX :: !{#Char} -> Int; SelectFontX :: !{#Char} -> Int;
GetFontStylesX :: !{#Char} -> !(!Int,!Int,!Int,!Int,!Int); GetFontStylesX :: !{#Char} -> (!Int,!Int,!Int,!Int,!Int);
GetFontSizesX :: !{#Char} -> Int; GetFontSizesX :: !{#Char} -> Int;
GetOneFontSizeX :: !Int -> Int; GetOneFontSizeX :: !Int -> Int;
...@@ -32,7 +32,7 @@ ShowPenX _ ...@@ -32,7 +32,7 @@ ShowPenX _
.end .end
}; };
GetPenX :: !Int -> !(!Int,!Int); GetPenX :: !Int -> (!Int,!Int);
GetPenX _ GetPenX _
= code { = code {
.inline GetPenX .inline GetPenX
...@@ -384,7 +384,7 @@ GetFontNameX _ ...@@ -384,7 +384,7 @@ GetFontNameX _
.end .end
}; };
GetFontInfoX :: !Int -> !(!Int,!Int,!Int,!Int,!Int); GetFontInfoX :: !Int -> (!Int,!Int,!Int,!Int,!Int);
GetFontInfoX _ GetFontInfoX _
= code { = code {
.inline GetFontInfoX .inline GetFontInfoX
...@@ -392,7 +392,7 @@ GetFontInfoX _ ...@@ -392,7 +392,7 @@ GetFontInfoX _
.end .end
}; };
GetFontFontInfoX :: !Int -> !(!Int,!Int,!Int,!Int); GetFontFontInfoX :: !Int -> (!Int,!Int,!Int,!Int);
GetFontFontInfoX _ GetFontFontInfoX _
= code { = code {
.inline GetFontFontInfoX .inline GetFontFontInfoX
...@@ -400,7 +400,7 @@ GetFontFontInfoX _ ...@@ -400,7 +400,7 @@ GetFontFontInfoX _
.end .end
}; };
GetStringWidthX :: !Int !{#Char} -> !(!Int,!Int); GetStringWidthX :: !Int !{#Char} -> (!Int,!Int);
GetStringWidthX _ _ GetStringWidthX _ _
= code { = code {
.inline GetStringWidthX .inline GetStringWidthX
...@@ -464,7 +464,7 @@ SelectFontX _ ...@@ -464,7 +464,7 @@ SelectFontX _
.end .end
}; };
GetFontStylesX :: !{#Char} -> !(!Int,!Int,!Int,!Int,!Int); GetFontStylesX :: !{#Char} -> (!Int,!Int,!Int,!Int,!Int);
GetFontStylesX _ GetFontStylesX _
= code { = code {
.inline GetFontStylesX .inline GetFontStylesX
......
...@@ -5,6 +5,6 @@ ChangeXTimerInterval :: !Int -> Int; ...@@ -5,6 +5,6 @@ ChangeXTimerInterval :: !Int -> Int;
GetTimerInfo :: !Int -> Int; GetTimerInfo :: !Int -> Int;
EnableTheTimer :: !Int -> Int; EnableTheTimer :: !Int -> Int;
DisableTheTimer :: !Int -> Int; DisableTheTimer :: !Int -> Int;
XGetCurrentTime :: !Int -> !(!Int,!Int,!Int); XGetCurrentTime :: !Int -> (!Int,!Int,!Int);
XGetCurrentDate :: !Int -> !(!Int,!Int,!Int,!Int); XGetCurrentDate :: !Int -> (!Int,!Int,!Int,!Int);
WaitmSeconds :: !Int -> Int; WaitmSeconds :: !Int -> Int;
...@@ -40,7 +40,7 @@ DisableTheTimer _ ...@@ -40,7 +40,7 @@ DisableTheTimer _
.end .end
}; };
XGetCurrentTime :: !Int -> !(!Int,!Int,!Int); XGetCurrentTime :: !Int -> (!Int,!Int,!Int);
XGetCurrentTime _ XGetCurrentTime _
= code { = code {
.inline XGetCurrentTime .inline XGetCurrentTime
...@@ -48,7 +48,7 @@ XGetCurrentTime _ ...@@ -48,7 +48,7 @@ XGetCurrentTime _
.end .end
}; };
XGetCurrentDate :: !Int -> !(!Int,!Int,!Int,!Int); XGetCurrentDate :: !Int -> (!Int,!Int,!Int,!Int);
XGetCurrentDate _ XGetCurrentDate _
= code { = code {
.inline XGetCurrentDate .inline XGetCurrentDate
......
system module xwindow; system module xwindow;
XCreateWindow :: !Int !Int !Int !Int !Int !{#Char} !Int !Int !Int !Int !Int !Int !Int !Int !Int !Int -> !(!Int,!Int); XCreateWindow :: !Int !Int !Int !Int !Int !{#Char} !Int !Int !Int !Int !Int !Int !Int !Int !Int !Int -> (!Int,!Int);
GetMouseInfo :: !Int -> !(!Int,!Int,!Int,!Int,!Int,!Int,!Int); GetMouseInfo :: !Int -> (!Int,!Int,!Int,!Int,!Int,!Int,!Int);
GetXExposeArea :: !Int -> !(!Int,!Int,!Int,!Int,!Int); GetXExposeArea :: !Int -> (!Int,!Int,!Int,!Int,!Int);
StartXUpdate :: !Int -> Int; StartXUpdate :: !Int -> Int;
EndXUpdate :: !Int -> Int; EndXUpdate :: !Int -> Int;
GetKeyboardInfo :: !Int -> !(!Int,!Int,!Int,!Int,!Int,!Int); GetKeyboardInfo :: !Int -> (!Int,!Int,!Int,!Int,!Int,!Int);
XScreenSize :: !Int -> !(!Int,!Int); XScreenSize :: !Int -> (!Int,!Int);
GetXWindowEvent :: !Int -> Int; GetXWindowEvent :: !Int -> Int;
XSetScrollBar :: !Int !Int !Int !Int !Int !Int !Int -> !(!Int,!Int); XSetScrollBar :: !Int !Int !Int !Int !Int !Int !Int -> (!Int,!Int);
XGetCurrentWindowSize :: !Int -> !(!Int,!Int); XGetCurrentWindowSize :: !Int -> (!Int,!Int);
XGetCurrentWindowThumbs :: !Int -> !(!Int,!Int); XGetCurrentWindowThumbs :: !Int -> (!Int,!Int);
ChangeXWindow :: !Int !Int !Int !Int !Int !Int !Int !Int !Int !Int !Int !Int !Int !Int -> Int; ChangeXWindow :: !Int !Int !Int !Int !Int !Int !Int !Int !Int !Int !Int !Int !Int !Int -> Int;
GetFirstUpdateX :: !Int -> !(!Int,!Int); GetFirstUpdateX :: !Int -> (!Int,!Int);
DiscardXUpdates :: !Int -> Int; DiscardXUpdates :: !Int -> Int;
XActivateWindow :: !Int -> Int; XActivateWindow :: !Int -> Int;
XSetWindowTitle :: !Int !{#Char} -> Int; XSetWindowTitle :: !Int !{#Char} -> Int;
XPopDown :: !Int -> Int; XPopDown :: !Int -> Int;
XPopup :: !Int -> Int; XPopup :: !Int -> Int;
XSetDoubleDownDistance :: !Int -> Int; XSetDoubleDownDistance :: !Int -> Int;
XGetWindowPosition :: !Int -> !(!Int,!Int); XGetWindowPosition :: !Int -> (!Int,!Int);
implementation module xwindow; implementation module xwindow;
XCreateWindow :: !Int !Int !Int !Int !Int !{#Char} !Int !Int !Int !Int