p[] instead of p^

This commit is contained in:
Araq 2011-04-11 23:28:53 +02:00
commit 46c41e4369
32 changed files with 242 additions and 346 deletions

View file

@ -3468,8 +3468,8 @@ when false:
result = g_array_insert_vals(a, i, addr(v), 1)
proc g_ptr_array_index*(parray: PGPtrArray, index: guint): gpointer =
result = cast[PGPointer](cast[int](parray ^. pdata) +
index * SizeOf(GPointer))^
result = cast[PGPointer](cast[int](parray []. pdata) +
index * SizeOf(GPointer))[]
proc G_THREAD_ERROR*(): TGQuark =
result = g_thread_error_quark()
@ -3754,7 +3754,7 @@ proc TGIOChannel_set_is_seekable*(a: PGIOChannel, `is_seekable`: guint) =
bm_TGIOChannel_is_seekable)
proc utf8_next_char*(p: pguchar): pguchar =
result = cast[pguchar](cast[TAddress](p) + 1) # p + ord((g_utf8_skip + p^ )^ )
result = cast[pguchar](cast[TAddress](p) + 1) # p + ord((g_utf8_skip + p[] )[] )
when false:
proc GLIB_CHECK_VERSION*(major, minor, micro: guint): bool =

View file

@ -10892,127 +10892,127 @@ proc FUNDAMENTAL_TYPE*(thetype: GType): GType =
proc VALUE_CHAR*(a: TArg): gchar =
var a = a
Result = cast[ptr gchar](addr(a.d))^
Result = cast[ptr gchar](addr(a.d))[]
proc VALUE_UCHAR*(a: TArg): guchar =
var a = a
Result = cast[ptr guchar](addr(a.d))^
Result = cast[ptr guchar](addr(a.d))[]
proc VALUE_BOOL*(a: TArg): gboolean =
var a = a
Result = cast[ptr gboolean](addr(a.d))^
Result = cast[ptr gboolean](addr(a.d))[]
proc VALUE_INT*(a: TArg): gint =
var a = a
Result = cast[ptr gint](addr(a.d))^
Result = cast[ptr gint](addr(a.d))[]
proc VALUE_UINT*(a: TArg): guint =
var a = a
Result = cast[ptr guint](addr(a.d))^
Result = cast[ptr guint](addr(a.d))[]
proc VALUE_LONG*(a: TArg): glong =
var a = a
Result = cast[ptr glong](addr(a.d))^
Result = cast[ptr glong](addr(a.d))[]
proc VALUE_ULONG*(a: TArg): gulong =
var a = a
Result = cast[ptr gulong](addr(a.d))^
Result = cast[ptr gulong](addr(a.d))[]
proc VALUE_FLOAT*(a: TArg): gfloat =
var a = a
Result = cast[ptr gfloat](addr(a.d))^
Result = cast[ptr gfloat](addr(a.d))[]
proc VALUE_DOUBLE*(a: TArg): gdouble =
var a = a
Result = cast[ptr gdouble](addr(a.d))^
Result = cast[ptr gdouble](addr(a.d))[]
proc VALUE_STRING*(a: TArg): cstring =
var a = a
Result = cast[ptr cstring](addr(a.d))^
Result = cast[ptr cstring](addr(a.d))[]
proc VALUE_ENUM*(a: TArg): gint =
var a = a
Result = cast[ptr gint](addr(a.d))^
Result = cast[ptr gint](addr(a.d))[]
proc VALUE_FLAGS*(a: TArg): guint =
var a = a
Result = cast[ptr guint](addr(a.d))^
Result = cast[ptr guint](addr(a.d))[]
proc VALUE_BOXED*(a: TArg): gpointer =
var a = a
Result = cast[ptr gpointer](addr(a.d))^
Result = cast[ptr gpointer](addr(a.d))[]
proc VALUE_OBJECT*(a: TArg): PObject =
var a = a
Result = cast[ptr PObject](addr(a.d))^
Result = cast[ptr PObject](addr(a.d))[]
proc VALUE_POINTER*(a: TArg): GPointer =
var a = a
Result = cast[ptr gpointer](addr(a.d))^
Result = cast[ptr gpointer](addr(a.d))[]
proc VALUE_SIGNAL*(a: TArg): TArgSignalData =
var a = a
Result = cast[ptr TArgSignalData](addr(a.d))^
Result = cast[ptr TArgSignalData](addr(a.d))[]
proc RETLOC_CHAR*(a: TArg): cstring =
var a = a
Result = cast[ptr cstring](addr(a.d))^
Result = cast[ptr cstring](addr(a.d))[]
proc RETLOC_UCHAR*(a: TArg): Pguchar =
var a = a
Result = cast[ptr pguchar](addr(a.d))^
Result = cast[ptr pguchar](addr(a.d))[]
proc RETLOC_BOOL*(a: TArg): Pgboolean =
var a = a
Result = cast[ptr pgboolean](addr(a.d))^
Result = cast[ptr pgboolean](addr(a.d))[]
proc RETLOC_INT*(a: TArg): Pgint =
var a = a
Result = cast[ptr pgint](addr(a.d))^
Result = cast[ptr pgint](addr(a.d))[]
proc RETLOC_UINT*(a: TArg): Pguint =
var a = a
Result = cast[ptr pguint](addr(a.d))^
Result = cast[ptr pguint](addr(a.d))[]
proc RETLOC_LONG*(a: TArg): Pglong =
var a = a
Result = cast[ptr pglong](addr(a.d))^
Result = cast[ptr pglong](addr(a.d))[]
proc RETLOC_ULONG*(a: TArg): Pgulong =
var a = a
Result = cast[ptr pgulong](addr(a.d))^
Result = cast[ptr pgulong](addr(a.d))[]
proc RETLOC_FLOAT*(a: TArg): Pgfloat =
var a = a
Result = cast[ptr pgfloat](addr(a.d))^
Result = cast[ptr pgfloat](addr(a.d))[]
proc RETLOC_DOUBLE*(a: TArg): Pgdouble =
var a = a
Result = cast[ptr pgdouble](addr(a.d))^
Result = cast[ptr pgdouble](addr(a.d))[]
proc RETLOC_STRING*(a: TArg): Ppgchar =
var a = a
Result = cast[ptr Ppgchar](addr(a.d))^
Result = cast[ptr Ppgchar](addr(a.d))[]
proc RETLOC_ENUM*(a: TArg): Pgint =
var a = a
Result = cast[ptr Pgint](addr(a.d))^
Result = cast[ptr Pgint](addr(a.d))[]
proc RETLOC_FLAGS*(a: TArg): Pguint =
var a = a
Result = cast[ptr pguint](addr(a.d))^
Result = cast[ptr pguint](addr(a.d))[]
proc RETLOC_BOXED*(a: TArg): Pgpointer =
var a = a
Result = cast[ptr pgpointer](addr(a.d))^
Result = cast[ptr pgpointer](addr(a.d))[]
proc RETLOC_OBJECT*(a: TArg): PPGtkObject =
var a = a
Result = cast[ptr ppgtkobject](addr(a.d))^
Result = cast[ptr ppgtkobject](addr(a.d))[]
proc RETLOC_POINTER*(a: TArg): Pgpointer =
var a = a
Result = cast[ptr pgpointer](addr(a.d))^
Result = cast[ptr pgpointer](addr(a.d))[]
proc TYPE_WIDGET*(): GType =
result = widget_get_type()