bugfix: rendering of case statements has been broken recently; remaining idents with wrong underscores in the wrappers

2026-01-18 02:27:10 +00:00 · 2010-02-02 23:20:21 +01:00
parent bdcf1ec1f7
commit e62ef0ff60
10 changed files with 330 additions and 301 deletions
--- a/doc/theindex.txt
+++ b/doc/theindex.txt
--- a/lib/newwrap/gtk/gdkglext.nim
+++ b/lib/newwrap/gtk/gdkglext.nim
@@ -1,6 +1,6 @@
 {.deadCodeElim: on.}
 import 
-  Glib2, 2
+  Glib2, gdk2

 when defined(WIN32): 
  const 
--- a/lib/newwrap/gtk/gtkglext.nim
+++ b/lib/newwrap/gtk/gtkglext.nim
@@ -1,6 +1,6 @@
 {.deadCodeElim: on.}
 import 
-  Glib2, Gdk2, 2, GdkGLExt
+  Glib2, Gdk2, gtk2, GdkGLExt

 const 
  GLExtLib* = if defined(WIN32): "libgtkglext-win32-1.0-0.dll" else: "libgtkglext-x11-1.0.so"
--- a/lib/newwrap/gtk/gtkhtml.nim
+++ b/lib/newwrap/gtk/gtkhtml.nim
@@ -1,6 +1,6 @@
 {.deadCodeElim: on.}
 import 
-  2, glib2, atk, pango, gdk2pixbuf, gdk2
+  gtk2, glib2, atk, pango, gdk2pixbuf, gdk2

 when defined(windows): 
  {.define: WINDOWING_WIN32.}
--- a/lib/pure/ropes.nim
+++ b/lib/pure/ropes.nim
@@ -1,7 +1,7 @@
 #
 #
 #            Nimrod's Runtime Library
-#        (c) Copyright 2009 Andreas Rumpf
+#        (c) Copyright 2010 Andreas Rumpf
 #
 #    See the file "copying.txt", included in this
 #    distribution, for details about the copyright.
@@ -13,7 +13,7 @@
 ## trees that are only flattened when converting to a native Nimrod
 ## string. The empty string is represented by ``nil``. Ropes are immutable and
 ## subtrees can be shared without copying.
-## Leaves can be cached for better memory efficiency at the cost of a bit of
+## Leaves can be cached for better memory efficiency at the cost of
 ## runtime efficiency.

 {.deadCodeElim: on.}
@@ -372,4 +372,4 @@ proc equalsFile*(r: PRope, f: string): bool =

 new(N) # init dummy node for splay algorithm

-{.pop.}
+{.pop.}
--- a/lib/wrappers/gtk/gtkhtml.nim
+++ b/lib/wrappers/gtk/gtkhtml.nim
@@ -40,16 +40,16 @@ const
  DOM_DOCUMENT_TYPE_NODE* = 10
  DOM_DOCUMENT_FRAGMENT_NODE* = 11
  DOM_NOTATION_NODE* = 12
-  bm__HtmlFontSpecification_weight* = 0x0000000F
-  bp__HtmlFontSpecification_weight* = 0
-  bm__HtmlFontSpecification_style* = 0x00000030
-  bp__HtmlFontSpecification_style* = 4
-  bm__HtmlFontSpecification_variant* = 0x000000C0
-  bp__HtmlFontSpecification_variant* = 6
-  bm__HtmlFontSpecification_stretch* = 0x00000F00
-  bp__HtmlFontSpecification_stretch* = 8
-  bm__HtmlFontSpecification_decoration* = 0x00007000
-  bp__HtmlFontSpecification_decoration* = 12
+  bm_HtmlFontSpecification_weight = 0x0000000F
+  bp_HtmlFontSpecification_weight = 0
+  bm_HtmlFontSpecification_style = 0x00000030
+  bp_HtmlFontSpecification_style = 4
+  bm_HtmlFontSpecification_variant = 0x000000C0
+  bp_HtmlFontSpecification_variant = 6
+  bm_HtmlFontSpecification_stretch = 0x00000F00
+  bp_HtmlFontSpecification_stretch = 8
+  bm_HtmlFontSpecification_decoration = 0x00007000
+  bp_HtmlFontSpecification_decoration = 12

 type 
  TDomString* = gchar
@@ -194,28 +194,28 @@ proc dom_node_get_type*(): GType{.cdecl, dynlib: gtkhtmllib,
                                  importc: "dom_node_get_type".}
 proc dom_Node_mkref*(node: pointer): PDomNode{.cdecl, dynlib: gtkhtmllib, 
    importc: "dom_Node_mkref".}
-proc dom_Node__get_childNodes*(node: PDomNode): PDomNodeList{.cdecl, 
+proc dom_Node_get_childNodes*(node: PDomNode): PDomNodeList{.cdecl, 
    dynlib: gtkhtmllib, importc: "dom_Node__get_childNodes".}
 proc dom_Node_removeChild*(node: PDomNode, oldChild: PDomNode, 
                           exc: PDomException): PDomNode{.cdecl, 
    dynlib: gtkhtmllib, importc: "dom_Node_removeChild".}
-proc dom_Node__get_nodeValue*(node: PDomNode, exc: PDomException): PDomString{.
+proc dom_Node_get_nodeValue*(node: PDomNode, exc: PDomException): PDomString{.
    cdecl, dynlib: gtkhtmllib, importc: "dom_Node__get_nodeValue".}
-proc dom_Node__get_firstChild*(node: PDomNode): PDomNode{.cdecl, 
+proc dom_Node_get_firstChild*(node: PDomNode): PDomNode{.cdecl, 
    dynlib: gtkhtmllib, importc: "dom_Node__get_firstChild".}
-proc dom_Node__get_nodeName*(node: PDomNode): PDomString{.cdecl, 
+proc dom_Node_get_nodeName*(node: PDomNode): PDomString{.cdecl, 
    dynlib: gtkhtmllib, importc: "dom_Node__get_nodeName".}
-proc dom_Node__get_attributes*(node: PDomNode): PDomNamedNodeMap{.cdecl, 
+proc dom_Node_get_attributes*(node: PDomNode): PDomNamedNodeMap{.cdecl, 
    dynlib: gtkhtmllib, importc: "dom_Node__get_attributes".}
-proc dom_Document__get_doctype*(doc: PDomDocument): PDomDocumentType{.cdecl, 
+proc dom_Document_get_doctype*(doc: PDomDocument): PDomDocumentType{.cdecl, 
    dynlib: gtkhtmllib, importc: "dom_Document__get_doctype".}
 proc dom_Node_hasChildNodes*(node: PDomNode): DomBoolean{.cdecl, 
    dynlib: gtkhtmllib, importc: "dom_Node_hasChildNodes".}
-proc dom_Node__get_parentNode*(node: PDomNode): PDomNode{.cdecl, 
+proc dom_Node_get_parentNode*(node: PDomNode): PDomNode{.cdecl, 
    dynlib: gtkhtmllib, importc: "dom_Node__get_parentNode".}
-proc dom_Node__get_nextSibling*(node: PDomNode): PDomNode{.cdecl, 
+proc dom_Node_get_nextSibling*(node: PDomNode): PDomNode{.cdecl, 
    dynlib: gtkhtmllib, importc: "dom_Node__get_nextSibling".}
-proc dom_Node__get_nodeType*(node: PDomNode): gushort{.cdecl, 
+proc dom_Node_get_nodeType*(node: PDomNode): gushort{.cdecl, 
    dynlib: gtkhtmllib, importc: "dom_Node__get_nodeType".}
 proc dom_Node_hasAttributes*(node: PDomNode): DomBoolean{.cdecl, 
    dynlib: gtkhtmllib, importc: "dom_Node_hasAttributes".}
@@ -224,18 +224,18 @@ proc dom_Node_cloneNode*(node: PDomNode, deep: DomBoolean): PDomNode{.cdecl,
 proc dom_Node_appendChild*(node: PDomNode, newChild: PDomNode, 
                           exc: PDomException): PDomNode{.cdecl, 
    dynlib: gtkhtmllib, importc: "dom_Node_appendChild".}
-proc dom_Node__get_localName*(node: PDomNode): PDomString{.cdecl, 
+proc dom_Node_get_localName*(node: PDomNode): PDomString{.cdecl, 
    dynlib: gtkhtmllib, importc: "dom_Node__get_localName".}
-proc dom_Node__get_namespaceURI*(node: PDomNode): PDomString{.cdecl, 
+proc dom_Node_get_namespaceURI*(node: PDomNode): PDomString{.cdecl, 
    dynlib: gtkhtmllib, importc: "dom_Node__get_namespaceURI".}
-proc dom_Node__get_previousSibling*(node: PDomNode): PDomNode{.cdecl, 
+proc dom_Node_get_previousSibling*(node: PDomNode): PDomNode{.cdecl, 
    dynlib: gtkhtmllib, importc: "dom_Node__get_previousSibling".}
-proc dom_Node__get_lastChild*(node: PDomNode): PDomNode{.cdecl, 
+proc dom_Node_get_lastChild*(node: PDomNode): PDomNode{.cdecl, 
    dynlib: gtkhtmllib, importc: "dom_Node__get_lastChild".}
-proc dom_Node__set_nodeValue*(node: PDomNode, value: PDomString, 
-                              exc: PDomException){.cdecl, dynlib: gtkhtmllib, 
+proc dom_Node_set_nodeValue*(node: PDomNode, value: PDomString, 
+                             exc: PDomException){.cdecl, dynlib: gtkhtmllib, 
    importc: "dom_Node__set_nodeValue".}
-proc dom_Node__get_ownerDocument*(node: PDomNode): PDomDocument{.cdecl, 
+proc dom_Node_get_ownerDocument*(node: PDomNode): PDomDocument{.cdecl, 
    dynlib: gtkhtmllib, importc: "dom_Node__get_ownerDocument".}
 proc dom_Node_hasAttributes*(node: PDomNode): gboolean{.cdecl, 
    dynlib: gtkhtmllib, importc: "dom_Node_hasAttributes".}
@@ -246,7 +246,7 @@ proc DOM_IS_DOCUMENT*(theobject: pointer): bool
 proc DOM_IS_DOCUMENT_CLASS*(klass: pointer): bool
 proc DOM_DOCUMENT_GET_CLASS*(obj: pointer): PDomDocumentClass
 proc dom_document_get_type*(): GType
-proc dom_Document__get_documentElement*(doc: PDomDocument): PDomElement
+proc dom_Document_get_documentElement*(doc: PDomDocument): PDomElement
 proc dom_Document_createElement*(doc: PDomDocument, tagName: PDomString): PDomElement
 proc dom_Document_createTextNode*(doc: PDomDocument, data: PDomString): PDomText
 proc dom_Document_createComment*(doc: PDomDocument, data: PDomString): PDomComment
--- a/lib/wrappers/x11/xrandr.nim
+++ b/lib/wrappers/x11/xrandr.nim
@@ -98,7 +98,7 @@ type
    mwidth*, mheight*: cint

  TXRRScreenChangeNotifyEvent*{.final.} = object  # internal representation is private to the library 
-    type_*: cint              # event base 
+    typ*: cint                # event base 
    serial*: culong           # # of last request processed by server 
    send_event*: TBool        # true if this came from a SendEvent request 
    display*: PDisplay        # Display the event was read from 
--- a/rod/rnimsyn.nim
+++ b/rod/rnimsyn.nim
@@ -585,7 +585,6 @@ proc gcase(g: var TSrcGen, n: PNode) =
  gsub(g, n.sons[0])
  gcoms(g)
  optNL(g)
-  last = 0
  gsons(g, n, c, 1, last)
  if last == - 2: 
    initContext(c)
--- a/web/news.txt
+++ b/web/news.txt
@@ -36,7 +36,8 @@ Additions
  your configuration file to use these.
 - Triple quoted strings allow for ``"`` in more contexts.
 - ``""`` within raw string literals stands for a single quotation mark.
- More extensive subscript operator overloading. See ``_ for further
+- More extensive subscript operator overloading. See 
+  `subscript overloading <manual.html#subscript-overloading>`_ for further
  information.


--- a/web/ticker.txt
+++ b/web/ticker.txt
@@ -1,6 +1,6 @@
 | `2009-12-21`:newsdate:
 | Nimrod version 0.8.6 has been released! 
-  Get it `here <./download.html>`_. Merry Christmas!
+  Get it `here <./download.html>`_.

 | `2009-10-21`:newsdate:
 | Nimrod version 0.8.2 has been released!