Posted to tcl by mr_calvin at Thu Oct 05 08:45:48 GMT 2017view raw

  1. Index: extensions/tnc/tnc.c
  2. ==================================================================
  3. --- extensions/tnc/tnc.c
  4. +++ extensions/tnc/tnc.c
  5. @@ -1793,11 +1793,11 @@
  6. /* If the document doesn't have a doctype declaration, but the
  7. user have used the -useForeignDTD 1 feature, the collected
  8. data out of the provided DTD isn't postprocessed by
  9. TncElementStartCommand. We do this now.
  10. NOTE: Since there wasn't a doctype declaration, there is no
  11. - information avaliable which element is expected to be the
  12. + information available which element is expected to be the
  13. document element. Eventually it would be desirable, to set
  14. this somehow. For now, this means, that every valid subtree
  15. of the given DTD information is accepted. */
  16. if (!tncdata->contentStackPtr && !tncdata->elemContentsRewriten) {
  17. TncEndDoctypeDeclHandler (userData);
  18.  
  19. Index: generic/dom.c
  20. ==================================================================
  21. --- generic/dom.c
  22. +++ generic/dom.c
  23. @@ -95,11 +95,11 @@
  24. static int domModuleIsInitialized = 0;
  25. TDomThreaded(static Tcl_Mutex initMutex;)
  26.  
  27. static char *domException2StringTable [] = {
  28.  
  29. - "OK - no expection",
  30. + "OK - no exception",
  31. "INDEX_SIZE_ERR",
  32. "DOMSTRING_SIZE_ERR",
  33. "HIERARCHY_REQUEST_ERR",
  34. "WRONG_DOCUMENT_ERR",
  35. "INVALID_CHARACTER_ERR",
  36. @@ -5430,11 +5430,11 @@
  37. Tcl_SetResult (interp, "parser object isn't tdom enabled.", NULL);
  38. return TCL_ERROR;
  39. }
  40. expat = GetExpatInfo (interp, objv[1]);
  41. if (info->tdomStatus != 2 || !expat->finished) {
  42. - Tcl_SetResult (interp, "No DOM tree avaliable.", NULL);
  43. + Tcl_SetResult (interp, "No DOM tree available.", NULL);
  44. return TCL_ERROR;
  45. }
  46. domSetDocumentElement (info->document);
  47. result = tcldom_returnDocumentObj (interp, info->document, 0,
  48. newObjName, 0, 0);
  49.  
  50. Index: generic/dom.h
  51. ==================================================================
  52. --- generic/dom.h
  53. +++ generic/dom.h
  54. @@ -721,11 +721,11 @@
  55.  
  56. /*--------------------------------------------------------------------------
  57. | Function prototypes
  58. |
  59. \-------------------------------------------------------------------------*/
  60. -const char * domException2String (domException expection);
  61. +const char * domException2String (domException exception);
  62.  
  63.  
  64. void domModuleInitialize (void);
  65. domDocument * domCreateDoc (const char *baseURI, int storeLineColumn);
  66. domDocument * domCreateDocument (Tcl_Interp *interp, const char *uri,
  67.  
  68. Index: generic/domxpath.c
  69. ==================================================================
  70. --- generic/domxpath.c
  71. +++ generic/domxpath.c
  72. @@ -193,11 +193,11 @@
  73. \---------------------------------------------------------------------------*/
  74. static char *astType2str[] = {
  75. "Int", "Real", "Mult", "Div", "Mod", "UnaryMinus", "IsNSElement",
  76. "IsNode", "IsComment", "IsText", "IsPI", "IsSpecificPI", "IsElement",
  77. "IsFQElement", "GetVar", "GetFQVar", "Literal", "ExecFunction", "Pred",
  78. - "EvalSteps", "SelectRoot", "CombineSets", "Add", "Substract", "Less",
  79. + "EvalSteps", "SelectRoot", "CombineSets", "Add", "Subtract", "Less",
  80. "LessOrEq", "Greater", "GreaterOrEq", "Equal", "NotEqual", "And", "Or",
  81. "IsNSAttr", "IsAttr", "AxisAncestor", "AxisAncestorOrSelf",
  82. "AxisAttribute", "AxisChild",
  83. "AxisDescendant", "AxisDescendantOrSelf", "AxisFollowing",
  84. "AxisFollowingSibling", "AxisNamespace", "AxisParent",
  85. @@ -1471,11 +1471,11 @@
  86. if (LA==PLUS) {
  87. Consume(PLUS);
  88. a = New2( Add, a, Recurse(MultiplicativeExpr));
  89. } else {
  90. Consume(MINUS);
  91. - a = New2( Substract, a, Recurse(MultiplicativeExpr));
  92. + a = New2( Subtract, a, Recurse(MultiplicativeExpr));
  93. }
  94. }
  95. EndProduction
  96.  
  97.  
  98. @@ -4379,11 +4379,11 @@
  99. case Real:
  100. rsSetReal (result, step->realvalue);
  101. break;
  102.  
  103. case Add:
  104. - case Substract:
  105. + case Subtract:
  106. case Mult:
  107. case Div:
  108. case Mod:
  109. xpathRSInit (&leftResult);
  110. xpathRSInit (&rightResult);
  111. @@ -4424,11 +4424,11 @@
  112. if (NaN || NaN1) {
  113. if ((NaN == 2) || (NaN1 == 2)) {
  114. rsSetNaN (result);
  115. } else {
  116. switch (step->type) {
  117. - case Substract:
  118. + case Subtract:
  119. NaN1 = -1 * NaN1;
  120. /* fall throu */
  121. case Add:
  122. if (NaN == NaN1) {
  123. if (NaN == 1) rsSetInf (result);
  124. @@ -4473,11 +4473,11 @@
  125. xpathRSFree (&leftResult);
  126. return XPATH_OK;
  127. }
  128. switch (step->type) {
  129. case Add: rsSetReal (result, dLeft + dRight); break;
  130. - case Substract: rsSetReal (result, dLeft - dRight); break;
  131. + case Subtract: rsSetReal (result, dLeft - dRight); break;
  132. case Mult: rsSetReal (result, dLeft * dRight); break;
  133. case Div:
  134. if (dRight == 0.0) {
  135. if (dLeft == 0.0) {
  136. rsSetNaN (result);
  137.  
  138. Index: generic/domxpath.h
  139. ==================================================================
  140. --- generic/domxpath.h
  141. +++ generic/domxpath.h
  142. @@ -73,11 +73,11 @@
  143. \---------------------------------------------------------------------------*/
  144. typedef enum {
  145. Int, Real, Mult, Div, Mod, UnaryMinus, IsNSElement,
  146. IsNode, IsComment, IsText, IsPI, IsSpecificPI, IsElement,
  147. IsFQElement, GetVar, GetFQVar, Literal, ExecFunction, Pred,
  148. - EvalSteps, SelectRoot, CombineSets, Add, Substract, Less,
  149. + EvalSteps, SelectRoot, CombineSets, Add, Subtract, Less,
  150. LessOrEq, Greater, GreaterOrEq, Equal, NotEqual, And, Or,
  151. IsNSAttr, IsAttr, AxisAncestor, AxisAncestorOrSelf,
  152. AxisAttribute, AxisChild,
  153. AxisDescendant, AxisDescendantOrSelf, AxisFollowing,
  154. AxisFollowingSibling, AxisNamespace, AxisParent,
  155.  
  156. Index: tests/tdomcmd.test
  157. ==================================================================
  158. --- tests/tdomcmd.test
  159. +++ tests/tdomcmd.test
  160. @@ -101,17 +101,17 @@
  161. rename dom {}
  162. rename _dom dom
  163.  
  164. $_main_parser free
  165.  
  166. -test tdomcmd-1.1 {no doc avaliable} {
  167. +test tdomcmd-1.1 {no doc available} {
  168. set parser [expat]
  169. tdom $parser enable
  170. set result [catch {tdom $parser getdoc} errMsg]
  171. $parser free
  172. lappend result $errMsg
  173. -} {1 {No DOM tree avaliable.}}
  174. +} {1 {No DOM tree available.}}
  175.  
  176. test tdomcmd-1.2 {request dom tree in the middle of parsing} {
  177. set parser [expat -final 0]
  178. tdom $parser enable
  179. $parser parse {<root>}
  180. @@ -124,11 +124,11 @@
  181. $parser parse {}
  182. lappend result [catch {set doc [tdom $parser getdoc]} errMsg]
  183. $doc delete
  184. $parser free
  185. set result
  186. -} {1 {No DOM tree avaliable.} 1 {No DOM tree avaliable.} 0}
  187. +} {1 {No DOM tree available.} 1 {No DOM tree available.} 0}
  188.  
  189. proc es-tdomcmd-1.3 {parser name attlist} {
  190. tdom $parser enable
  191. }
  192.  
  193.  
  194. Index: unix/CONFIG
  195. ==================================================================
  196. --- unix/CONFIG
  197. +++ unix/CONFIG
  198. @@ -45,11 +45,11 @@
  199. # If building tDOM as module for AOLserver, this points to the
  200. # directory with the AOLserver source distribution. See below
  201. # for examples.
  202. #
  203. # --with-tdom
  204. -# Useful (and avaliable) only for building extensions to tDOM (as
  205. +# Useful (and available) only for building extensions to tDOM (as
  206. # tnc). Use it to point to the tdomConfig.sh file.
  207. #
  208. #
  209. #
  210. # Comment-out next line if building with GCC compiler.