diff options
author | Damien Doligez <damien.doligez-inria.fr> | 2002-10-11 19:01:19 +0000 |
---|---|---|
committer | Damien Doligez <damien.doligez-inria.fr> | 2002-10-11 19:01:19 +0000 |
commit | 4aef78fc74d5d03b3c9d6e388ad8e725638d4291 (patch) | |
tree | 0b7ef5f10a3741e31ea29ac4b5b86473c79c25e8 /otherlibs | |
parent | 5a15044a7075a454b687e987886154f3eb181be1 (diff) |
PR#1423
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@5175 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
Diffstat (limited to 'otherlibs')
-rw-r--r-- | otherlibs/labltk/builtin/builtini_GetPixel.ml | 16 | ||||
-rw-r--r-- | otherlibs/labltk/builtin/builtini_ScrollValue.ml | 4 | ||||
-rw-r--r-- | otherlibs/labltk/camltk/.depend | 62 | ||||
-rw-r--r-- | otherlibs/labltk/compiler/compile.ml | 2 | ||||
-rw-r--r-- | otherlibs/labltk/examples_labltk/calc.ml | 4 | ||||
-rw-r--r-- | otherlibs/labltk/labltk/.depend | 30 |
6 files changed, 59 insertions, 59 deletions
diff --git a/otherlibs/labltk/builtin/builtini_GetPixel.ml b/otherlibs/labltk/builtin/builtini_GetPixel.ml index 65df3d31a..12e7890f4 100644 --- a/otherlibs/labltk/builtin/builtini_GetPixel.ml +++ b/otherlibs/labltk/builtin/builtini_GetPixel.ml @@ -2,10 +2,10 @@ let cCAMLtoTKunits = function Pixels (foo) -> TkToken (string_of_int foo) - | Millimeters (foo) -> TkToken(string_of_float foo^"m") - | Inches (foo) -> TkToken(string_of_float foo^"i") - | PrinterPoint (foo) -> TkToken(string_of_float foo^"p") - | Centimeters (foo) -> TkToken(string_of_float foo^"c") + | Millimeters (foo) -> TkToken(Printf.sprintf "%gm" foo) + | Inches (foo) -> TkToken(Printf.sprintf "%gi" foo) + | PrinterPoint (foo) -> TkToken(Printf.sprintf "%gp" foo) + | Centimeters (foo) -> TkToken(Printf.sprintf "%gc" foo) ;; let cTKtoCAMLunits str = @@ -23,10 +23,10 @@ let cTKtoCAMLunits str = let cCAMLtoTKunits : units -> tkArgs = function | `Pix (foo) -> TkToken (string_of_int foo) - | `Mm (foo) -> TkToken(string_of_float foo^"m") - | `In (foo) -> TkToken(string_of_float foo^"i") - | `Pt (foo) -> TkToken(string_of_float foo^"p") - | `Cm (foo) -> TkToken(string_of_float foo^"c") + | `Mm (foo) -> TkToken(Printf.sprintf "%gm" foo) + | `In (foo) -> TkToken(Printf.sprintf "%gi" foo) + | `Pt (foo) -> TkToken(Printf.sprintf "%gp" foo) + | `Cm (foo) -> TkToken(Printf.sprintf "%gc" foo) ;; let cTKtoCAMLunits str = diff --git a/otherlibs/labltk/builtin/builtini_ScrollValue.ml b/otherlibs/labltk/builtin/builtini_ScrollValue.ml index 0361238b4..08498a00d 100644 --- a/otherlibs/labltk/builtin/builtini_ScrollValue.ml +++ b/otherlibs/labltk/builtin/builtini_ScrollValue.ml @@ -6,7 +6,7 @@ let cCAMLtoTKscrollValue = function | ScrollUnit v1 -> TkTokenList [TkToken"scroll"; TkToken (string_of_int v1); TkToken"units"] | MoveTo v1 -> - TkTokenList [TkToken"moveto"; TkToken (string_of_float v1)] + TkTokenList [TkToken"moveto"; TkToken (Printf.sprintf "%g" v1)] ;; (* str l -> scrllv -> str l *) @@ -28,7 +28,7 @@ let cCAMLtoTKscrollValue : scrollValue -> tkArgs = function | `Unit v1 -> TkTokenList [TkToken"scroll"; TkToken (string_of_int v1); TkToken"units"] | `Moveto v1 -> - TkTokenList [TkToken"moveto"; TkToken (string_of_float v1)] + TkTokenList [TkToken"moveto"; TkToken (Printf.sprintf "%g" v1)] ;; (* str l -> scrllv -> str l *) diff --git a/otherlibs/labltk/camltk/.depend b/otherlibs/labltk/camltk/.depend index 6c4ac94bc..203fe291a 100644 --- a/otherlibs/labltk/camltk/.depend +++ b/otherlibs/labltk/camltk/.depend @@ -11,16 +11,16 @@ cFont.cmi: cTk.cmo ../support/textvariable.cmi ../support/widget.cmi cFrame.cmi: cTk.cmo ../support/textvariable.cmi ../support/widget.cmi cGrab.cmi: cTk.cmo ../support/textvariable.cmi ../support/widget.cmi cGrid.cmi: cTk.cmo ../support/textvariable.cmi ../support/widget.cmi -cImagebitmap.cmi: cTk.cmo ../support/textvariable.cmi ../support/widget.cmi cImage.cmi: cTk.cmo ../support/textvariable.cmi ../support/widget.cmi +cImagebitmap.cmi: cTk.cmo ../support/textvariable.cmi ../support/widget.cmi cImagephoto.cmi: cTk.cmo ../support/textvariable.cmi ../support/widget.cmi cLabel.cmi: cTk.cmo ../support/textvariable.cmi ../support/widget.cmi cListbox.cmi: cTk.cmo ../support/textvariable.cmi ../support/widget.cmi -cMenubutton.cmi: cTk.cmo ../support/textvariable.cmi ../support/widget.cmi cMenu.cmi: cTk.cmo ../support/textvariable.cmi ../support/widget.cmi +cMenubutton.cmi: cTk.cmo ../support/textvariable.cmi ../support/widget.cmi cMessage.cmi: cTk.cmo ../support/textvariable.cmi ../support/widget.cmi -cOptionmenu.cmi: cTk.cmo ../support/textvariable.cmi ../support/widget.cmi cOption.cmi: cTk.cmo ../support/textvariable.cmi ../support/widget.cmi +cOptionmenu.cmi: cTk.cmo ../support/textvariable.cmi ../support/widget.cmi cPack.cmi: cTk.cmo ../support/textvariable.cmi ../support/widget.cmi cPalette.cmi: cTk.cmo ../support/textvariable.cmi ../support/widget.cmi cPixmap.cmi: cTk.cmo ../support/textvariable.cmi ../support/widget.cmi @@ -36,22 +36,6 @@ cTkwait.cmi: cTk.cmo ../support/textvariable.cmi ../support/widget.cmi cToplevel.cmi: cTk.cmo ../support/textvariable.cmi ../support/widget.cmi cWinfo.cmi: cTk.cmo ../support/textvariable.cmi ../support/widget.cmi cWm.cmi: cTk.cmo ../support/textvariable.cmi ../support/widget.cmi -camltk.cmo: cBell.cmi cButton.cmi cCanvas.cmi cCheckbutton.cmi cClipboard.cmi \ - cDialog.cmi cEncoding.cmi cEntry.cmi cFocus.cmi cFont.cmi cFrame.cmi \ - cGrab.cmi cGrid.cmi cImage.cmi cImagebitmap.cmi cImagephoto.cmi \ - cLabel.cmi cListbox.cmi cMenu.cmi cMenubutton.cmi cMessage.cmi \ - cOption.cmi cOptionmenu.cmi cPack.cmi cPalette.cmi cPixmap.cmi cPlace.cmi \ - cRadiobutton.cmi cResource.cmi cScale.cmi cScrollbar.cmi cSelection.cmi \ - cText.cmi cTk.cmo cTkvars.cmi cTkwait.cmi cToplevel.cmi cWinfo.cmi \ - cWm.cmi -camltk.cmx: cBell.cmx cButton.cmx cCanvas.cmx cCheckbutton.cmx cClipboard.cmx \ - cDialog.cmx cEncoding.cmx cEntry.cmx cFocus.cmx cFont.cmx cFrame.cmx \ - cGrab.cmx cGrid.cmx cImage.cmx cImagebitmap.cmx cImagephoto.cmx \ - cLabel.cmx cListbox.cmx cMenu.cmx cMenubutton.cmx cMessage.cmx \ - cOption.cmx cOptionmenu.cmx cPack.cmx cPalette.cmx cPixmap.cmx cPlace.cmx \ - cRadiobutton.cmx cResource.cmx cScale.cmx cScrollbar.cmx cSelection.cmx \ - cText.cmx cTk.cmx cTkvars.cmx cTkwait.cmx cToplevel.cmx cWinfo.cmx \ - cWm.cmx cBell.cmo: cTk.cmo ../support/protocol.cmi ../support/textvariable.cmi \ ../support/widget.cmi cBell.cmi cBell.cmx: cTk.cmx ../support/protocol.cmx ../support/textvariable.cmx \ @@ -104,14 +88,14 @@ cGrid.cmo: cTk.cmo ../support/protocol.cmi ../support/textvariable.cmi \ ../support/widget.cmi cGrid.cmi cGrid.cmx: cTk.cmx ../support/protocol.cmx ../support/textvariable.cmx \ ../support/widget.cmx cGrid.cmi -cImagebitmap.cmo: cTk.cmo ../support/protocol.cmi ../support/textvariable.cmi \ - ../support/widget.cmi cImagebitmap.cmi -cImagebitmap.cmx: cTk.cmx ../support/protocol.cmx ../support/textvariable.cmx \ - ../support/widget.cmx cImagebitmap.cmi cImage.cmo: cTk.cmo ../support/protocol.cmi ../support/textvariable.cmi \ ../support/widget.cmi cImage.cmi cImage.cmx: cTk.cmx ../support/protocol.cmx ../support/textvariable.cmx \ ../support/widget.cmx cImage.cmi +cImagebitmap.cmo: cTk.cmo ../support/protocol.cmi ../support/textvariable.cmi \ + ../support/widget.cmi cImagebitmap.cmi +cImagebitmap.cmx: cTk.cmx ../support/protocol.cmx ../support/textvariable.cmx \ + ../support/widget.cmx cImagebitmap.cmi cImagephoto.cmo: cTk.cmo ../support/protocol.cmi ../support/textvariable.cmi \ ../support/widget.cmi cImagephoto.cmi cImagephoto.cmx: cTk.cmx ../support/protocol.cmx ../support/textvariable.cmx \ @@ -124,26 +108,26 @@ cListbox.cmo: cTk.cmo ../support/protocol.cmi ../support/textvariable.cmi \ ../support/widget.cmi cListbox.cmi cListbox.cmx: cTk.cmx ../support/protocol.cmx ../support/textvariable.cmx \ ../support/widget.cmx cListbox.cmi -cMenubutton.cmo: cTk.cmo ../support/protocol.cmi ../support/textvariable.cmi \ - ../support/widget.cmi cMenubutton.cmi -cMenubutton.cmx: cTk.cmx ../support/protocol.cmx ../support/textvariable.cmx \ - ../support/widget.cmx cMenubutton.cmi cMenu.cmo: cTk.cmo ../support/protocol.cmi ../support/textvariable.cmi \ ../support/widget.cmi cMenu.cmi cMenu.cmx: cTk.cmx ../support/protocol.cmx ../support/textvariable.cmx \ ../support/widget.cmx cMenu.cmi +cMenubutton.cmo: cTk.cmo ../support/protocol.cmi ../support/textvariable.cmi \ + ../support/widget.cmi cMenubutton.cmi +cMenubutton.cmx: cTk.cmx ../support/protocol.cmx ../support/textvariable.cmx \ + ../support/widget.cmx cMenubutton.cmi cMessage.cmo: cTk.cmo ../support/protocol.cmi ../support/textvariable.cmi \ ../support/widget.cmi cMessage.cmi cMessage.cmx: cTk.cmx ../support/protocol.cmx ../support/textvariable.cmx \ ../support/widget.cmx cMessage.cmi -cOptionmenu.cmo: cTk.cmo ../support/protocol.cmi ../support/textvariable.cmi \ - ../support/widget.cmi cOptionmenu.cmi -cOptionmenu.cmx: cTk.cmx ../support/protocol.cmx ../support/textvariable.cmx \ - ../support/widget.cmx cOptionmenu.cmi cOption.cmo: cTk.cmo ../support/protocol.cmi ../support/textvariable.cmi \ ../support/widget.cmi cOption.cmi cOption.cmx: cTk.cmx ../support/protocol.cmx ../support/textvariable.cmx \ ../support/widget.cmx cOption.cmi +cOptionmenu.cmo: cTk.cmo ../support/protocol.cmi ../support/textvariable.cmi \ + ../support/widget.cmi cOptionmenu.cmi +cOptionmenu.cmx: cTk.cmx ../support/protocol.cmx ../support/textvariable.cmx \ + ../support/widget.cmx cOptionmenu.cmi cPack.cmo: cTk.cmo ../support/protocol.cmi ../support/textvariable.cmi \ ../support/widget.cmi cPack.cmi cPack.cmx: cTk.cmx ../support/protocol.cmx ../support/textvariable.cmx \ @@ -208,3 +192,19 @@ cWm.cmo: cTk.cmo ../support/protocol.cmi ../support/textvariable.cmi \ ../support/widget.cmi cWm.cmi cWm.cmx: cTk.cmx ../support/protocol.cmx ../support/textvariable.cmx \ ../support/widget.cmx cWm.cmi +camltk.cmo: cBell.cmi cButton.cmi cCanvas.cmi cCheckbutton.cmi cClipboard.cmi \ + cDialog.cmi cEncoding.cmi cEntry.cmi cFocus.cmi cFont.cmi cFrame.cmi \ + cGrab.cmi cGrid.cmi cImage.cmi cImagebitmap.cmi cImagephoto.cmi \ + cLabel.cmi cListbox.cmi cMenu.cmi cMenubutton.cmi cMessage.cmi \ + cOption.cmi cOptionmenu.cmi cPack.cmi cPalette.cmi cPixmap.cmi cPlace.cmi \ + cRadiobutton.cmi cResource.cmi cScale.cmi cScrollbar.cmi cSelection.cmi \ + cText.cmi cTk.cmo cTkvars.cmi cTkwait.cmi cToplevel.cmi cWinfo.cmi \ + cWm.cmi +camltk.cmx: cBell.cmx cButton.cmx cCanvas.cmx cCheckbutton.cmx cClipboard.cmx \ + cDialog.cmx cEncoding.cmx cEntry.cmx cFocus.cmx cFont.cmx cFrame.cmx \ + cGrab.cmx cGrid.cmx cImage.cmx cImagebitmap.cmx cImagephoto.cmx \ + cLabel.cmx cListbox.cmx cMenu.cmx cMenubutton.cmx cMessage.cmx \ + cOption.cmx cOptionmenu.cmx cPack.cmx cPalette.cmx cPixmap.cmx cPlace.cmx \ + cRadiobutton.cmx cResource.cmx cScale.cmx cScrollbar.cmx cSelection.cmx \ + cText.cmx cTk.cmx cTkvars.cmx cTkwait.cmx cToplevel.cmx cWinfo.cmx \ + cWm.cmx diff --git a/otherlibs/labltk/compiler/compile.ml b/otherlibs/labltk/compiler/compile.ml index 42754dfd3..b6b1fcd88 100644 --- a/otherlibs/labltk/compiler/compile.ml +++ b/otherlibs/labltk/compiler/compile.ml @@ -553,7 +553,7 @@ let write_TKtoCAML ~w name ~def:typdef = let rec converterCAMLtoTK ~context_widget argname ty = match ty with Int -> "TkToken (string_of_int " ^ argname ^ ")" - | Float -> "TkToken (string_of_float " ^ argname ^ ")" + | Float -> "TkToken (Printf.sprintf \"%g\" " ^ argname ^ ")" | Bool -> "if " ^ argname ^ " then TkToken \"1\" else TkToken \"0\"" | Char -> "TkToken (Char.escaped " ^ argname ^ ")" | String -> "TkToken " ^ argname diff --git a/otherlibs/labltk/examples_labltk/calc.ml b/otherlibs/labltk/examples_labltk/calc.ml index 4f980bec0..088bf192f 100644 --- a/otherlibs/labltk/examples_labltk/calc.ml +++ b/otherlibs/labltk/examples_labltk/calc.ml @@ -69,7 +69,7 @@ class calc () = object (calc) | Some f -> x <- f x (calc#get_float); op <- Some (List.assoc c ops); - calc#set (string_of_float x) + calc#set (Printf.sprintf "%g" x) end | '='|'\n'|'\r' -> displaying <- true; @@ -78,7 +78,7 @@ class calc () = object (calc) | Some f -> x <- f x (calc#get_float); op <- None; - calc#set (string_of_float x) + calc#set (Printf.sprintf "%g" x) end | 'q' -> closeTk (); exit 0 | _ -> () diff --git a/otherlibs/labltk/labltk/.depend b/otherlibs/labltk/labltk/.depend index e3cd27cf1..f1273b18b 100644 --- a/otherlibs/labltk/labltk/.depend +++ b/otherlibs/labltk/labltk/.depend @@ -11,16 +11,16 @@ font.cmi: ../support/textvariable.cmi tk.cmo ../support/widget.cmi frame.cmi: ../support/textvariable.cmi tk.cmo ../support/widget.cmi grab.cmi: ../support/textvariable.cmi tk.cmo ../support/widget.cmi grid.cmi: ../support/textvariable.cmi tk.cmo ../support/widget.cmi -imagebitmap.cmi: ../support/textvariable.cmi tk.cmo ../support/widget.cmi image.cmi: ../support/textvariable.cmi tk.cmo ../support/widget.cmi +imagebitmap.cmi: ../support/textvariable.cmi tk.cmo ../support/widget.cmi imagephoto.cmi: ../support/textvariable.cmi tk.cmo ../support/widget.cmi label.cmi: ../support/textvariable.cmi tk.cmo ../support/widget.cmi listbox.cmi: ../support/textvariable.cmi tk.cmo ../support/widget.cmi -menubutton.cmi: ../support/textvariable.cmi tk.cmo ../support/widget.cmi menu.cmi: ../support/textvariable.cmi tk.cmo ../support/widget.cmi +menubutton.cmi: ../support/textvariable.cmi tk.cmo ../support/widget.cmi message.cmi: ../support/textvariable.cmi tk.cmo ../support/widget.cmi -optionmenu.cmi: ../support/textvariable.cmi tk.cmo ../support/widget.cmi option.cmi: ../support/textvariable.cmi tk.cmo ../support/widget.cmi +optionmenu.cmi: ../support/textvariable.cmi tk.cmo ../support/widget.cmi pack.cmi: ../support/textvariable.cmi tk.cmo ../support/widget.cmi palette.cmi: ../support/textvariable.cmi tk.cmo ../support/widget.cmi pixmap.cmi: ../support/textvariable.cmi tk.cmo ../support/widget.cmi @@ -87,14 +87,14 @@ grid.cmo: ../support/protocol.cmi ../support/textvariable.cmi tk.cmo \ ../support/widget.cmi grid.cmi grid.cmx: ../support/protocol.cmx ../support/textvariable.cmx tk.cmx \ ../support/widget.cmx grid.cmi -imagebitmap.cmo: ../support/protocol.cmi ../support/textvariable.cmi tk.cmo \ - ../support/widget.cmi imagebitmap.cmi -imagebitmap.cmx: ../support/protocol.cmx ../support/textvariable.cmx tk.cmx \ - ../support/widget.cmx imagebitmap.cmi image.cmo: ../support/protocol.cmi ../support/textvariable.cmi tk.cmo \ ../support/widget.cmi image.cmi image.cmx: ../support/protocol.cmx ../support/textvariable.cmx tk.cmx \ ../support/widget.cmx image.cmi +imagebitmap.cmo: ../support/protocol.cmi ../support/textvariable.cmi tk.cmo \ + ../support/widget.cmi imagebitmap.cmi +imagebitmap.cmx: ../support/protocol.cmx ../support/textvariable.cmx tk.cmx \ + ../support/widget.cmx imagebitmap.cmi imagephoto.cmo: ../support/protocol.cmi ../support/textvariable.cmi tk.cmo \ ../support/widget.cmi imagephoto.cmi imagephoto.cmx: ../support/protocol.cmx ../support/textvariable.cmx tk.cmx \ @@ -125,26 +125,26 @@ listbox.cmo: ../support/protocol.cmi ../support/textvariable.cmi tk.cmo \ ../support/widget.cmi listbox.cmi listbox.cmx: ../support/protocol.cmx ../support/textvariable.cmx tk.cmx \ ../support/widget.cmx listbox.cmi -menubutton.cmo: ../support/protocol.cmi ../support/textvariable.cmi tk.cmo \ - ../support/widget.cmi menubutton.cmi -menubutton.cmx: ../support/protocol.cmx ../support/textvariable.cmx tk.cmx \ - ../support/widget.cmx menubutton.cmi menu.cmo: ../support/protocol.cmi ../support/textvariable.cmi tk.cmo \ ../support/widget.cmi menu.cmi menu.cmx: ../support/protocol.cmx ../support/textvariable.cmx tk.cmx \ ../support/widget.cmx menu.cmi +menubutton.cmo: ../support/protocol.cmi ../support/textvariable.cmi tk.cmo \ + ../support/widget.cmi menubutton.cmi +menubutton.cmx: ../support/protocol.cmx ../support/textvariable.cmx tk.cmx \ + ../support/widget.cmx menubutton.cmi message.cmo: ../support/protocol.cmi ../support/textvariable.cmi tk.cmo \ ../support/widget.cmi message.cmi message.cmx: ../support/protocol.cmx ../support/textvariable.cmx tk.cmx \ ../support/widget.cmx message.cmi -optionmenu.cmo: ../support/protocol.cmi ../support/textvariable.cmi tk.cmo \ - ../support/widget.cmi optionmenu.cmi -optionmenu.cmx: ../support/protocol.cmx ../support/textvariable.cmx tk.cmx \ - ../support/widget.cmx optionmenu.cmi option.cmo: ../support/protocol.cmi ../support/textvariable.cmi tk.cmo \ ../support/widget.cmi option.cmi option.cmx: ../support/protocol.cmx ../support/textvariable.cmx tk.cmx \ ../support/widget.cmx option.cmi +optionmenu.cmo: ../support/protocol.cmi ../support/textvariable.cmi tk.cmo \ + ../support/widget.cmi optionmenu.cmi +optionmenu.cmx: ../support/protocol.cmx ../support/textvariable.cmx tk.cmx \ + ../support/widget.cmx optionmenu.cmi pack.cmo: ../support/protocol.cmi ../support/textvariable.cmi tk.cmo \ ../support/widget.cmi pack.cmi pack.cmx: ../support/protocol.cmx ../support/textvariable.cmx tk.cmx \ |