jyapayne/Nim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Bugfix: empty echo statement

Browse source
This commit is contained in:
Andreas Rumpf 2010-03-20 01:07:34 +01:00
commit c5d8a5c1da
5 changed files with 19 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

3
lib/impure/dialogs.nim
View file

@ -79,9 +79,8 @@ proc ChooseFileToOpen*(window: PWindow, root: string = ""): string =
else: else:
result = "" result = ""
else: else:
assert file_chooser_dialog_new != nil
var chooser = file_chooser_dialog_new("Open File", window, var chooser = file_chooser_dialog_new("Open File", window,
FILE_CHOOSER_ACTION_OPEN, FILE_CHOOSER_ACTION_OPEN,
STOCK_CANCEL, RESPONSE_CANCEL, STOCK_CANCEL, RESPONSE_CANCEL,
STOCK_OPEN, RESPONSE_OK, nil) STOCK_OPEN, RESPONSE_OK, nil)
if root.len > 0: if root.len > 0:

2
lib/pure/complex.nim
View file

@ -97,7 +97,7 @@ proc sqrt*(z: TComplex): TComplex =
w = sqrt(y) * sqrt(0.5 * (r + sqrt(1.0 + r * r))) w = sqrt(y) * sqrt(0.5 * (r + sqrt(1.0 + r * r)))
if z.re >= 0.0: if z.re >= 0.0:
result.re = w result.re = w
result.im = z.im / (w * 2) result.im = z.im / (w * 2.0)
else: else:
if z.im >= 0.0: result.im = w if z.im >= 0.0: result.im = w
else: result.im = -w else: result.im = -w

33
lib/wrappers/gtk/gtk2.nim
View file

@ -4665,7 +4665,6 @@ proc set_in_button*(a: PButton, `in_button`: guint)
proc button_down*(a: PButton): guint proc button_down*(a: PButton): guint
proc set_button_down*(a: PButton, `button_down`: guint) proc set_button_down*(a: PButton, `button_down`: guint)
proc relief*(a: PButton): guint proc relief*(a: PButton): guint
proc set_relief*(a: PButton, `relief`: guint)
proc use_underline*(a: PButton): guint proc use_underline*(a: PButton): guint
proc set_use_underline*(a: PButton, `use_underline`: guint) proc set_use_underline*(a: PButton, `use_underline`: guint)
proc use_stock*(a: PButton): guint proc use_stock*(a: PButton): guint
@ -5366,20 +5365,20 @@ proc set_auto_sort*(clist: PCList, auto_sort: gboolean){.cdecl,
proc create_cell_layout*(clist: PCList, clist_row: PCListRow, column: gint): pango.PLayout{. proc create_cell_layout*(clist: PCList, clist_row: PCListRow, column: gint): pango.PLayout{.
cdecl, dynlib: lib, importc: "_gtk_clist_create_cell_layout".} cdecl, dynlib: lib, importc: "_gtk_clist_create_cell_layout".}
const const
DIALOG_MODAL* = 1 shl 0 DIALOG_MODAL* = cint(1 shl 0)
DIALOG_DESTROY_WITH_PARENT* = 1 shl 1 DIALOG_DESTROY_WITH_PARENT* = cint(1 shl 1)
DIALOG_NO_SEPARATOR* = 1 shl 2 DIALOG_NO_SEPARATOR* = cint(1 shl 2)
RESPONSE_NONE* = - (1) RESPONSE_NONE* = - cint(1)
RESPONSE_REJECT* = - (2) RESPONSE_REJECT* = - cint(2)
RESPONSE_ACCEPT* = - (3) RESPONSE_ACCEPT* = - cint(3)
RESPONSE_DELETE_EVENT* = - (4) RESPONSE_DELETE_EVENT* = - cint(4)
RESPONSE_OK* = - (5) RESPONSE_OK* = - cint(5)
RESPONSE_CANCEL* = - (6) RESPONSE_CANCEL* = - cint(6)
RESPONSE_CLOSE* = - (7) RESPONSE_CLOSE* = - cint(7)
RESPONSE_YES* = - (8) RESPONSE_YES* = - cint(8)
RESPONSE_NO* = - (9) RESPONSE_NO* = - cint(9)
RESPONSE_APPLY* = - (10) RESPONSE_APPLY* = - cint(10)
RESPONSE_HELP* = - (11) RESPONSE_HELP* = - cint(11)
proc TYPE_DIALOG*(): GType proc TYPE_DIALOG*(): GType
proc DIALOG*(obj: pointer): PDialog proc DIALOG*(obj: pointer): PDialog
@ -11828,10 +11827,6 @@ proc set_button_down*(a: PButton, `button_down`: guint) =
proc relief*(a: PButton): guint = proc relief*(a: PButton): guint =
result = (a.Buttonflag0 and bm_TGtkButton_relief) shr bp_TGtkButton_relief result = (a.Buttonflag0 and bm_TGtkButton_relief) shr bp_TGtkButton_relief
proc set_relief*(a: PButton, `relief`: guint) =
a.Buttonflag0 = a.Buttonflag0 or
(int16(`relief` shl bp_TGtkButton_relief) and bm_TGtkButton_relief)
proc use_underline*(a: PButton): guint = proc use_underline*(a: PButton): guint =
result = (a.Buttonflag0 and bm_TGtkButton_use_underline) shr result = (a.Buttonflag0 and bm_TGtkButton_use_underline) shr
bp_TGtkButton_use_underline bp_TGtkButton_use_underline

2
rod/semfold.nim
View file

@ -259,6 +259,8 @@ proc leValueConv(a, b: PNode): bool =
proc magicCall(m: PSym, n: PNode): PNode = proc magicCall(m: PSym, n: PNode): PNode =
var s = n.sons[0].sym var s = n.sons[0].sym
if sonsLen(n) <= 1: return
var a = getConstExpr(m, n.sons[1]) var a = getConstExpr(m, n.sons[1])
var b, c: PNode var b, c: PNode
if a == nil: return if a == nil: return

2
tests/accept/compile/tlibs.nim
View file

@ -3,7 +3,7 @@
import import
unicode, cgi, terminal, libcurl, web, unicode, cgi, terminal, libcurl, web,
parsexml, parseopt, parsecfg, parsexml, parseopt, parsecfg,
osproc, osproc, complex,
sdl, smpeg, sdl_gfx, sdl_net, sdl_mixer, sdl_ttf, sdl, smpeg, sdl_gfx, sdl_net, sdl_mixer, sdl_ttf,
sdl_image, sdl_mixer_nosmpeg, sdl_image, sdl_mixer_nosmpeg,
cursorfont, xatom, xf86vmode, xkb, xrandr, xshm, xvlib, keysym, xcms, xi, cursorfont, xatom, xf86vmode, xkb, xrandr, xshm, xvlib, keysym, xcms, xi,