| 1 |
Description: <short summary of the patch> |
| 2 |
TODO: Put a short summary on the line above and replace this paragraph |
| 3 |
with a longer explanation of this change. Complete the meta-information |
| 4 |
with other relevant fields (see below for details). To make it easier, the |
| 5 |
information below has been extracted from the changelog. Adjust it or drop |
| 6 |
it. |
| 7 |
. |
| 8 |
gcl (2.6.14-5) unstable; urgency=medium |
| 9 |
. |
| 10 |
* Version_2_6_15pre4 |
| 11 |
Author: Camm Maguire <[email protected]> |
| 12 |
|
| 13 |
--- |
| 14 |
The information above should follow the Patch Tagging Guidelines, please |
| 15 |
checkout https://dep.debian.net/deps/dep3/ to learn about the format. Here |
| 16 |
are templates for supplementary fields that you might want to add: |
| 17 |
|
| 18 |
Origin: (upstream|backport|vendor|other), (<patch-url>|commit:<commit-id>) |
| 19 |
Bug: <upstream-bugtracker-url> |
| 20 |
Bug-Debian: https://bugs.debian.org/<bugnumber> |
| 21 |
Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber> |
| 22 |
Forwarded: (no|not-needed|<patch-forwarded-url>) |
| 23 |
Applied-Upstream: <version>, (<commit-url>|commit:<commid-id>) |
| 24 |
Reviewed-By: <name and email of someone who approved/reviewed the patch> |
| 25 |
Last-Update: 2024-02-23 |
| 26 |
|
| 27 |
--- gcl-2.6.14.orig/RELEASE-2.5.1 |
| 28 |
+++ gcl-2.6.14/RELEASE-2.5.1 |
| 29 |
@@ -133,6 +133,6 @@ TO DO: |
| 30 |
1) Full ANSI compliance |
| 31 |
2) Native optimized blas support |
| 32 |
3) Integrate MPI support |
| 33 |
- 4) GCL as a suported GCC front end. |
| 34 |
+ 4) GCL as a supported GCC front end. |
| 35 |
5) Performance/memory optimization |
| 36 |
|
| 37 |
--- gcl-2.6.14.orig/ansi-tests/ensure-directories-exist.lsp |
| 38 |
+++ gcl-2.6.14/ansi-tests/ensure-directories-exist.lsp |
| 39 |
@@ -108,7 +108,7 @@ |
| 40 |
|
| 41 |
;;; Case where directory shouldn't exist |
| 42 |
|
| 43 |
-;; The directort ansi-tests/scratch must not exist before this |
| 44 |
+;; The directory ansi-tests/scratch must not exist before this |
| 45 |
;; test is run |
| 46 |
(deftest ensure-directories-exist.8 |
| 47 |
(let* ((subdir (make-pathname :directory '(:relative "scratch") |
| 48 |
--- gcl-2.6.14.orig/ansi-tests/iteration.lsp |
| 49 |
+++ gcl-2.6.14/ansi-tests/iteration.lsp |
| 50 |
@@ -121,7 +121,7 @@ |
| 51 |
(%f)))) |
| 52 |
45) |
| 53 |
|
| 54 |
-;;; Confirm that the variables in succesive iterations are |
| 55 |
+;;; Confirm that the variables in successive iterations are |
| 56 |
;;; identical |
| 57 |
(deftest do.15 |
| 58 |
(mapcar #'funcall |
| 59 |
@@ -240,7 +240,7 @@ |
| 60 |
(%f)))) |
| 61 |
45) |
| 62 |
|
| 63 |
-;;; Confirm that the variables in succesive iterations are |
| 64 |
+;;; Confirm that the variables in successive iterations are |
| 65 |
;;; identical |
| 66 |
(deftest do*.15 |
| 67 |
(mapcar #'funcall |
| 68 |
--- gcl-2.6.14.orig/ansi-tests/loop1.lsp |
| 69 |
+++ gcl-2.6.14/ansi-tests/loop1.lsp |
| 70 |
@@ -211,7 +211,7 @@ |
| 71 |
(loop for x from 1 to 5 do nil finally (return x)) |
| 72 |
5) |
| 73 |
|
| 74 |
-;;; Test that the index variable acheives the exclusive |
| 75 |
+;;; Test that the index variable achieves the exclusive |
| 76 |
;;; upper bound, but does not exceed it. |
| 77 |
(deftest loop.1.41 |
| 78 |
(loop for x from 1 below 5 do nil finally (return x)) |
| 79 |
@@ -224,4 +224,4 @@ |
| 80 |
(deftest loop.1.43 |
| 81 |
(loop for x from 10 above 0 do nil finally (return x)) |
| 82 |
1) |
| 83 |
-|# |
| 84 |
\ No newline at end of file |
| 85 |
+|# |
| 86 |
--- gcl-2.6.14.orig/git.tag |
| 87 |
+++ gcl-2.6.14/git.tag |
| 88 |
@@ -1 +1 @@ |
| 89 |
-"Version_2_6_15pre3" |
| 90 |
+"Version_2_6_15pre4" |
| 91 |
--- gcl-2.6.14.orig/h/elf64_riscv64_reloc.h |
| 92 |
+++ gcl-2.6.14/h/elf64_riscv64_reloc.h |
| 93 |
@@ -23,8 +23,50 @@ |
| 94 |
case R_RISCV_JAL: |
| 95 |
break; |
| 96 |
case R_RISCV_64: |
| 97 |
- store_val(where,MASK(64),(s+a)); |
| 98 |
+ store_val(where,~0L,(s+a)); |
| 99 |
break; |
| 100 |
case R_RISCV_32: |
| 101 |
store_val(where,MASK(32),(s+a)); |
| 102 |
break; |
| 103 |
+ case R_RISCV_32_PCREL: |
| 104 |
+ store_val(where,MASK(32),(s+a)-p); |
| 105 |
+ break; |
| 106 |
+ case R_RISCV_ADD8: |
| 107 |
+ add_val(where,MASK(8),(s+a)); |
| 108 |
+ break; |
| 109 |
+ case R_RISCV_ADD16: |
| 110 |
+ add_val(where,MASK(16),(s+a)); |
| 111 |
+ break; |
| 112 |
+ case R_RISCV_ADD32: |
| 113 |
+ add_val(where,MASK(32),(s+a)); |
| 114 |
+ break; |
| 115 |
+ case R_RISCV_ADD64: |
| 116 |
+ add_val(where,~0L,(s+a)); |
| 117 |
+ break; |
| 118 |
+ case R_RISCV_SUB6: |
| 119 |
+ add_val(where,MASK(6),-(s+a)); |
| 120 |
+ break; |
| 121 |
+ case R_RISCV_SUB8: |
| 122 |
+ add_val(where,MASK(8),-(s+a)); |
| 123 |
+ break; |
| 124 |
+ case R_RISCV_SUB16: |
| 125 |
+ add_val(where,MASK(16),-(s+a)); |
| 126 |
+ break; |
| 127 |
+ case R_RISCV_SUB32: |
| 128 |
+ add_val(where,MASK(32),-(s+a)); |
| 129 |
+ break; |
| 130 |
+ case R_RISCV_SUB64: |
| 131 |
+ add_val(where,~0L,-(s+a)); |
| 132 |
+ break; |
| 133 |
+ case R_RISCV_SET6: |
| 134 |
+ store_val(where,MASK(6),(s+a)); |
| 135 |
+ break; |
| 136 |
+ case R_RISCV_SET8: |
| 137 |
+ store_val(where,MASK(8),(s+a)); |
| 138 |
+ break; |
| 139 |
+ case R_RISCV_SET16: |
| 140 |
+ store_val(where,MASK(16),(s+a)); |
| 141 |
+ break; |
| 142 |
+ case R_RISCV_SET32: |
| 143 |
+ store_val(where,MASK(32),(s+a)); |
| 144 |
+ break; |
| 145 |
--- gcl-2.6.14.orig/info/chap-10.texi |
| 146 |
+++ gcl-2.6.14/info/chap-10.texi |
| 147 |
@@ -996,7 +996,7 @@ If there is no @i{property} with that @i |
| 148 |
|
| 149 |
@b{setf} of @b{get} may be used to associate a new @i{object} |
| 150 |
with an existing indicator already on the @i{symbol}'s @i{property list}, |
| 151 |
-or to create a new assocation if none exists. |
| 152 |
+or to create a new association if none exists. |
| 153 |
|
| 154 |
If there are multiple @i{properties}_1 with that @i{property indicator}, |
| 155 |
@b{setf} of @b{get} associates the @i{new-value} |
| 156 |
--- gcl-2.6.14.orig/info/chap-14.texi |
| 157 |
+++ gcl-2.6.14/info/chap-14.texi |
| 158 |
@@ -160,7 +160,7 @@ and the @i{cdr} is the @i{value} associa |
| 159 |
@w{ assoc assoc-if-not rassoc rassoc-if-not } |
| 160 |
|
| 161 |
@noindent |
| 162 |
-@w{ Figure 14--4: Some defined names related to assocation lists.} |
| 163 |
+@w{ Figure 14--4: Some defined names related to association lists.} |
| 164 |
|
| 165 |
@end group |
| 166 |
@end format |
| 167 |
@@ -3046,7 +3046,7 @@ If there is no @i{property} with that @i |
| 168 |
|
| 169 |
@b{setf} of @b{getf} may be used to associate a new @i{object} |
| 170 |
with an existing indicator in the @i{property list} held by @i{place}, |
| 171 |
-or to create a new assocation if none exists. |
| 172 |
+or to create a new association if none exists. |
| 173 |
|
| 174 |
If there are multiple @i{properties}_1 with that @i{property indicator}, |
| 175 |
@b{setf} of @b{getf} associates the @i{new-value} |
| 176 |
--- gcl-2.6.14.orig/info/chap-19.texi |
| 177 |
+++ gcl-2.6.14/info/chap-19.texi |
| 178 |
@@ -2119,7 +2119,7 @@ is signaled. |
| 179 |
|
| 180 |
@b{translate-logical-pathname} might perform additional translations, |
| 181 |
typically to provide translation of file types to local naming |
| 182 |
- conventions, to accomodate physical file systems with limited length |
| 183 |
+ conventions, to accommodate physical file systems with limited length |
| 184 |
names, or to deal with special character requirements such as |
| 185 |
translating hyphens to underscores or uppercase letters to lowercase. |
| 186 |
Any such additional translations are @i{implementation-defined}. Some |
| 187 |
--- gcl-2.6.14.orig/info/chap-21.texi |
| 188 |
+++ gcl-2.6.14/info/chap-21.texi |
| 189 |
@@ -867,9 +867,9 @@ restricted to @b{integer} or a @i{subtyp |
| 190 |
@subsubheading Examples:: |
| 191 |
|
| 192 |
@example |
| 193 |
-;; Note that the stream must accomodate at least the specified type, |
| 194 |
-;; but might accomodate other types. Further note that even if it does |
| 195 |
-;; accomodate exactly the specified type, the type might be specified in |
| 196 |
+;; Note that the stream must accommodate at least the specified type, |
| 197 |
+;; but might accommodate other types. Further note that even if it does |
| 198 |
+;; accommodate exactly the specified type, the type might be specified in |
| 199 |
;; any of several ways. |
| 200 |
(with-open-file (s "test" :element-type '(integer 0 1) |
| 201 |
:if-exists :error |
| 202 |
@@ -2180,7 +2180,7 @@ and some aspects of the @i{file system} |
| 203 |
to define. A given @i{implementation} might not be able to support all of these options |
| 204 |
in exactly the manner stated. An @i{implementation} is required to recognize all of |
| 205 |
these option keywords and to try to do something ``reasonable'' in the context of the |
| 206 |
-host @i{file system}. Where necessary to accomodate the @i{file system}, |
| 207 |
+host @i{file system}. Where necessary to accommodate the @i{file system}, |
| 208 |
an @i{implementation} deviate slightly from the semantics specified here without |
| 209 |
being disqualified for consideration as a @i{conforming implementation}. |
| 210 |
If it is utterly impossible for an @i{implementation} to handle some option |
| 211 |
--- gcl-2.6.14.orig/info/chap-26.texi |
| 212 |
+++ gcl-2.6.14/info/chap-26.texi |
| 213 |
@@ -2218,7 +2218,7 @@ transitive verb |
| 214 |
and that is one of: |
| 215 |
the @i{symbol} @t{:default} |
| 216 |
(denoting an @i{implementation-dependent} default |
| 217 |
- @i{external file format} that can accomodate at least |
| 218 |
+ @i{external file format} that can accommodate at least |
| 219 |
the @i{base characters}), |
| 220 |
some other @i{object} defined by the @i{implementation} to be |
| 221 |
an @i{external file format designator} |
| 222 |
--- gcl-2.6.14.orig/info/chap-5.texi |
| 223 |
+++ gcl-2.6.14/info/chap-5.texi |
| 224 |
@@ -3595,7 +3595,7 @@ rather than @b{eql} in a way that cannot |
| 225 |
@subsubheading Description:: |
| 226 |
|
| 227 |
The value of @b{eql} is @i{true} of two objects, @i{x} and |
| 228 |
-@i{y}, in the folowing cases: |
| 229 |
+@i{y}, in the following cases: |
| 230 |
@table @asis |
| 231 |
|
| 232 |
@item 1. |
| 233 |
--- gcl-2.6.14.orig/info/chap-9.texi |
| 234 |
+++ gcl-2.6.14/info/chap-9.texi |
| 235 |
@@ -681,7 +681,7 @@ the @t{:test} option to @b{restart-case} |
| 236 |
|
| 237 |
A @i{restart} can be ``associated with'' a @i{condition} explicitly |
| 238 |
by @b{with-condition-restarts}, or implicitly by @b{restart-case}. |
| 239 |
-Such an assocation has @i{dynamic extent}. |
| 240 |
+Such an association has @i{dynamic extent}. |
| 241 |
|
| 242 |
A single @i{restart} may be associated with several @i{conditions} |
| 243 |
at the same time. |
| 244 |
@@ -2075,7 +2075,7 @@ This and the lack of any possibility of |
| 245 |
differences between @b{break} and @b{cerror}. |
| 246 |
|
| 247 |
The user interface aspects of @b{break} and @b{cerror} are |
| 248 |
-permitted to vary more widely, in order to accomodate the interface |
| 249 |
+permitted to vary more widely, in order to accommodate the interface |
| 250 |
needs of the @i{implementation}. For example, it is permissible for a |
| 251 |
@i{Lisp read-eval-print loop} to be entered by @b{break} rather |
| 252 |
than the conventional debugger. |
| 253 |
@@ -3464,7 +3464,7 @@ by the @b{restart-case} clause to receiv |
| 254 |
to @b{invoke-restart}. |
| 255 |
|
| 256 |
By default, @b{invoke-restart-interactively} passes no arguments and |
| 257 |
-all arguments must be optional in order to accomodate interactive |
| 258 |
+all arguments must be optional in order to accommodate interactive |
| 259 |
restarting. However, the arguments need not be optional if the |
| 260 |
@t{:interactive} |
| 261 |
keyword has been used to inform @b{invoke-restart-interactively} |
| 262 |
--- gcl-2.6.14.orig/info/compile.texi |
| 263 |
+++ gcl-2.6.14/info/compile.texi |
| 264 |
@@ -260,22 +260,22 @@ GPROF-SET with both argments set to 0. |
| 265 |
|
| 266 |
|
| 267 |
@defvar *DEFAULT-SYSTEM-P* |
| 268 |
-Pakcage:COMPILER |
| 269 |
+Package:COMPILER |
| 270 |
Specifies the default setting of :SYSTEM-P used by COMPILE. Defaults to NIL. |
| 271 |
@end defvar |
| 272 |
|
| 273 |
@defvar *DEFAULT-C-FILE* |
| 274 |
-Pakcage:COMPILER |
| 275 |
+Package:COMPILER |
| 276 |
Specifies the default setting of :C-FILE used by COMPILE. Defaults to NIL. |
| 277 |
@end defvar |
| 278 |
|
| 279 |
@defvar *DEFAULT-H-FILE* |
| 280 |
-Pakcage:COMPILER |
| 281 |
+Package:COMPILER |
| 282 |
Specifies the default setting of :H-FILE used by COMPILE. Defaults to NIL. |
| 283 |
@end defvar |
| 284 |
|
| 285 |
@defvar *DEFAULT-DATA-FILE* |
| 286 |
-Pakcage:COMPILER |
| 287 |
+Package:COMPILER |
| 288 |
Specifies the default setting of :DATA-FILE used by COMPILE. Defaults to NIL. |
| 289 |
@end defvar |
| 290 |
|
| 291 |
--- gcl-2.6.14.orig/info/gcl-si.info |
| 292 |
+++ gcl-2.6.14/info/gcl-si.info |
| 293 |
@@ -4228,19 +4228,19 @@ keyword is supplied to compile-file and |
| 294 |
restored by calling GPROF-SET with both argments set to 0. |
| 295 |
|
| 296 |
-- Variable: *DEFAULT-SYSTEM-P* |
| 297 |
- Pakcage:COMPILER Specifies the default setting of :SYSTEM-P used by |
| 298 |
+ Package:COMPILER Specifies the default setting of :SYSTEM-P used by |
| 299 |
COMPILE. Defaults to NIL. |
| 300 |
|
| 301 |
-- Variable: *DEFAULT-C-FILE* |
| 302 |
- Pakcage:COMPILER Specifies the default setting of :C-FILE used by |
| 303 |
+ Package:COMPILER Specifies the default setting of :C-FILE used by |
| 304 |
COMPILE. Defaults to NIL. |
| 305 |
|
| 306 |
-- Variable: *DEFAULT-H-FILE* |
| 307 |
- Pakcage:COMPILER Specifies the default setting of :H-FILE used by |
| 308 |
+ Package:COMPILER Specifies the default setting of :H-FILE used by |
| 309 |
COMPILE. Defaults to NIL. |
| 310 |
|
| 311 |
-- Variable: *DEFAULT-DATA-FILE* |
| 312 |
- Pakcage:COMPILER Specifies the default setting of :DATA-FILE used |
| 313 |
+ Package:COMPILER Specifies the default setting of :DATA-FILE used |
| 314 |
by COMPILE. Defaults to NIL. |
| 315 |
|
| 316 |
-- Variable: *FEATURES* |
| 317 |
--- gcl-2.6.14.orig/info/gcl-si/Compilation.html |
| 318 |
+++ gcl-2.6.14/info/gcl-si/Compilation.html |
| 319 |
@@ -312,32 +312,32 @@ to be profiled. All subsequent calls to |
| 320 |
address range. By default, the range is set to begin at the starting |
| 321 |
address of the .text section, and to end at the current end of the |
| 322 |
running core. These default values can be restored by calling |
| 323 |
-GPROF-SET with both argments set to 0. |
| 324 |
+GPROF-SET with both arguments set to 0. |
| 325 |
</p> |
| 326 |
</dd></dl> |
| 327 |
|
| 328 |
|
| 329 |
<dl> |
| 330 |
<dt id="index-_002aDEFAULT_002dSYSTEM_002dP_002a">Variable: <strong>*DEFAULT-SYSTEM-P*</strong></dt> |
| 331 |
-<dd><p>Pakcage:COMPILER |
| 332 |
+<dd><p>Package:COMPILER |
| 333 |
Specifies the default setting of :SYSTEM-P used by COMPILE. Defaults to NIL. |
| 334 |
</p></dd></dl> |
| 335 |
|
| 336 |
<dl> |
| 337 |
<dt id="index-_002aDEFAULT_002dC_002dFILE_002a">Variable: <strong>*DEFAULT-C-FILE*</strong></dt> |
| 338 |
-<dd><p>Pakcage:COMPILER |
| 339 |
+<dd><p>Package:COMPILER |
| 340 |
Specifies the default setting of :C-FILE used by COMPILE. Defaults to NIL. |
| 341 |
</p></dd></dl> |
| 342 |
|
| 343 |
<dl> |
| 344 |
<dt id="index-_002aDEFAULT_002dH_002dFILE_002a">Variable: <strong>*DEFAULT-H-FILE*</strong></dt> |
| 345 |
-<dd><p>Pakcage:COMPILER |
| 346 |
+<dd><p>Package:COMPILER |
| 347 |
Specifies the default setting of :H-FILE used by COMPILE. Defaults to NIL. |
| 348 |
</p></dd></dl> |
| 349 |
|
| 350 |
<dl> |
| 351 |
<dt id="index-_002aDEFAULT_002dDATA_002dFILE_002a">Variable: <strong>*DEFAULT-DATA-FILE*</strong></dt> |
| 352 |
-<dd><p>Pakcage:COMPILER |
| 353 |
+<dd><p>Package:COMPILER |
| 354 |
Specifies the default setting of :DATA-FILE used by COMPILE. Defaults to NIL. |
| 355 |
</p></dd></dl> |
| 356 |
|
| 357 |
--- gcl-2.6.14.orig/info/gcl-si/User-Interface.html |
| 358 |
+++ gcl-2.6.14/info/gcl-si/User-Interface.html |
| 359 |
@@ -114,7 +114,7 @@ Start and End in order. |
| 360 |
<dl> |
| 361 |
<dt id="index-_002aBREAK_002dENABLE_002a">Variable: <strong>*BREAK-ENABLE*</strong></dt> |
| 362 |
<dd><p>Package:LISP |
| 363 |
-GCL specific: When an error occurrs, control enters to the break loop only |
| 364 |
+GCL specific: When an error occurs, control enters to the break loop only |
| 365 |
if the value of this variable is non-NIL. |
| 366 |
</p> |
| 367 |
|
| 368 |
--- gcl-2.6.14.orig/info/gcl/eql.html |
| 369 |
+++ gcl-2.6.14/info/gcl/eql.html |
| 370 |
@@ -57,7 +57,7 @@ Next: <a href="equal.html" accesskey="n" |
| 371 |
<span id="Description_003a_003a-87"></span><h4 class="subsubheading">Description::</h4> |
| 372 |
|
| 373 |
<p>The value of <b>eql</b> is <i>true</i> of two objects, <i>x</i> and |
| 374 |
-<i>y</i>, in the folowing cases: |
| 375 |
+<i>y</i>, in the following cases: |
| 376 |
</p><dl compact="compact"> |
| 377 |
<dt>1.</dt> |
| 378 |
<dd><p>If <i>x</i> and <i>y</i> are <b>eq</b>. |
| 379 |
--- gcl-2.6.14.orig/info/gcl/get.html |
| 380 |
+++ gcl-2.6.14/info/gcl/get.html |
| 381 |
@@ -78,7 +78,7 @@ and returns its corresponding <i>propert |
| 382 |
</p> |
| 383 |
<p><b>setf</b> of <b>get</b> may be used to associate a new <i>object</i> |
| 384 |
with an existing indicator already on the <i>symbol</i>’s <i>property list</i>, |
| 385 |
-or to create a new assocation if none exists. |
| 386 |
+or to create a new association if none exists. |
| 387 |
</p> |
| 388 |
<p>If there are multiple <i>properties</i>_1 with that <i>property indicator</i>, |
| 389 |
<b>setf</b> of <b>get</b> associates the <i>new-value</i> |
| 390 |
--- gcl-2.6.14.orig/info/gcl/intersection.html |
| 391 |
+++ gcl-2.6.14/info/gcl/intersection.html |
| 392 |
@@ -99,7 +99,7 @@ the <tt>:key</tt> function typically ret |
| 393 |
If <tt>:key</tt> is not supplied or <b>nil</b>, the <i>list-1</i> and |
| 394 |
<i>list-2</i> elements are used. |
| 395 |
</p> |
| 396 |
-<p>For every pair that <i>satifies the test</i>, |
| 397 |
+<p>For every pair that <i>satisfies the test</i>, |
| 398 |
exactly one of the two elements of the pair will be put in the result. |
| 399 |
No element from either <i>list</i> appears in the result that does not |
| 400 |
<i>satisfy the test</i> for |
| 401 |
--- gcl-2.6.14.orig/info/si-defs.texi |
| 402 |
+++ gcl-2.6.14/info/si-defs.texi |
| 403 |
@@ -507,7 +507,7 @@ Faslink does not work on most UNIX syste |
| 404 |
@defun TOP-LEVEL () |
| 405 |
Package:SI |
| 406 |
|
| 407 |
-GCL specific: Starts the standard top-level listner of GCL. When the GCL |
| 408 |
+GCL specific: Starts the standard top-level listener of GCL. When the GCL |
| 409 |
process is invoked, it calls SI:TOP-LEVEL by (FUNCALL 'SI:TOP-LEVEL). |
| 410 |
To change the top-level of GCL, redefine SI:TOP-LEVEL and save the core |
| 411 |
imange in a file. When the saved imange is invoked, it will start the |
| 412 |
@@ -926,7 +926,7 @@ Non nil means that a string-match should |
| 413 |
Package: SI |
| 414 |
Match regexp PATTERN in STRING starting in string starting at START |
| 415 |
and ending at END. Return -1 if match not found, otherwise |
| 416 |
-return the start index of the first matchs. The variable |
| 417 |
+return the start index of the first matches. The variable |
| 418 |
*MATCH-DATA* will be set to a fixnum array of sufficient size to hold |
| 419 |
the matches, to be obtained with match-beginning and match-end. |
| 420 |
If it already contains such an array, then the contents of it will |
| 421 |
--- gcl-2.6.14.orig/readme |
| 422 |
+++ gcl-2.6.14/readme |
| 423 |
@@ -160,7 +160,7 @@ A new compiler has been written, which i |
| 424 |
and provides some other benefits. It will be in a future release. |
| 425 |
We will need people willing to beta test and isolate any bugs. |
| 426 |
|
| 427 |
-Additonal work planned or desired: |
| 428 |
+Additional work planned or desired: |
| 429 |
|
| 430 |
* Clean up distribution and installation. Make it easier to link in |
| 431 |
C code such as Novak's window stuff. Faslink is not portable (since |
| 432 |
--- gcl-2.6.14.orig/xgcl-2/Xakcl.paper |
| 433 |
+++ gcl-2.6.14/xgcl-2/Xakcl.paper |
| 434 |
@@ -23,7 +23,7 @@ |
| 435 |
B. Creating and Using Windows |
| 436 |
|
| 437 |
1. Creating Windows |
| 438 |
- 2. Controling Window attributes |
| 439 |
+ 2. Controlling Window attributes |
| 440 |
3. Getting Window Geometry |
| 441 |
|
| 442 |
C. How to Use the Graphics Context |
| 443 |
@@ -64,11 +64,11 @@ All rights reserved. See section G for |
| 444 |
Xakcl is the basic Xwindows library for Akcl lisp (the C |
| 445 |
header files for the library correspond to Xlib.h, Xutil.h, and X.h). |
| 446 |
Since Xakcl supports only the basic Xwindows library, Xakcl |
| 447 |
-programming is intended to be a low level programming aproach to |
| 448 |
+programming is intended to be a low level programming approach to |
| 449 |
graphics. As a consequence, any Xwindows program written in C can |
| 450 |
also be written in Xakcl, with little cost in performance. The |
| 451 |
-primitive operations range from controling minute details in color, to |
| 452 |
-creating pixmaps, and configuring windows. Thus a programer using |
| 453 |
+primitive operations range from controlling minute details in color, to |
| 454 |
+creating pixmaps, and configuring windows. Thus a programmer using |
| 455 |
xakcl can exploit both the extensibility of Xwindows graphics |
| 456 |
capabilities and the ease of lisp programming. |
| 457 |
|
| 458 |
@@ -80,12 +80,12 @@ library routines and programming convent |
| 459 |
not required. All X functions in Xakcl begin with the letter 'X' , |
| 460 |
unless otherwise mentioned. The Syntax and names of Xakcl functions |
| 461 |
are kept as closely to the X library functions as possible, so that a |
| 462 |
-user of the Xwindows' C libary will have no trouble in learning how to |
| 463 |
+user of the Xwindows' C library will have no trouble in learning how to |
| 464 |
use Xakcl. Of course this also makes translation of X programs in C, |
| 465 |
into Lisp easier. For an introduction to X programming in C 'Xlib |
| 466 |
Programming Manual for version 11' by Adrian Nye is suggested. Also, |
| 467 |
any reference manual on the X library would be helpful, since the |
| 468 |
-names of Xakcl functions are identical to those of the C libararies' |
| 469 |
+names of Xakcl functions are identical to those of the C libraries' |
| 470 |
functions. |
| 471 |
|
| 472 |
|
| 473 |
@@ -107,7 +107,7 @@ I. Initializing the Display |
| 474 |
|
| 475 |
|
| 476 |
In the X windows system, a display on which graphics is being |
| 477 |
-done must be specified. The display is initilized by calling the X |
| 478 |
+done must be specified. The display is initialised by calling the X |
| 479 |
function XOpenDisplay. For example, |
| 480 |
|
| 481 |
|
| 482 |
@@ -123,7 +123,7 @@ can only handle events for one display a |
| 483 |
|
| 484 |
Creating many displays could be useful for applications with |
| 485 |
many different windows, but there is a performance cost. It usually |
| 486 |
-takes the X serever some time to return a display ID. |
| 487 |
+takes the X server some time to return a display ID. |
| 488 |
|
| 489 |
|
| 490 |
|
| 491 |
@@ -144,7 +144,7 @@ commands: |
| 492 |
|
| 493 |
|
| 494 |
The default screen is the screen on which graphics will be |
| 495 |
-drawn, and the root window, is the window that the X serever creates |
| 496 |
+drawn, and the root window, is the window that the X server creates |
| 497 |
from which all other windows are created. This is the window that is |
| 498 |
created with the call to xstart, and resides in the background. |
| 499 |
|
| 500 |
@@ -187,7 +187,7 @@ on how drawings will be done. The line |
| 501 |
the graphics context, as well as the color and the way lines join (if |
| 502 |
they join at a rounded edge or at an angle.) For now, only the |
| 503 |
creation of the graphics context will be of concern. XDefaultGC will |
| 504 |
-get a default grapics context. For example: |
| 505 |
+get a default graphics context. For example: |
| 506 |
|
| 507 |
|
| 508 |
(setq *default-GC* (XDefaultGC *default-display* *default-screen*)) |
| 509 |
@@ -211,7 +211,7 @@ example, when using XDrawString, X will |
| 510 |
this case, Black in the GC to draw the string. Also, XDrawImageString |
| 511 |
could be used. This routine, X draws the string in the foreground |
| 512 |
pixel and fills the background with the background pixel. If the |
| 513 |
-foregorund and background pixels were switched than the string would |
| 514 |
+foreground and background pixels were switched than the string would |
| 515 |
be white letters on a black background. This is an example of |
| 516 |
highlighting text. |
| 517 |
|
| 518 |
@@ -226,7 +226,7 @@ colormap allows the user to match pixel |
| 519 |
black pixel created by XBlackPixel is an example of a pixel value. A |
| 520 |
colormap may or may not have the exact color that is being requested. |
| 521 |
The closest pixel value is given to the user. In order to get a set |
| 522 |
-of specific colors it is necesary to create a unique colormap, however |
| 523 |
+of specific colors it is necessary to create a unique colormap, however |
| 524 |
for most applications, the default colormap will do. An example of |
| 525 |
creating a default colormap is shown below. |
| 526 |
|
| 527 |
@@ -296,7 +296,7 @@ structure, and it's initialization. |
| 528 |
|
| 529 |
Like all Xwindows structures in Xakcl, XSizeHints can be |
| 530 |
created using the function make followed by the type name of the |
| 531 |
-struture (note however that unlike Xsizehints, the graphics context is |
| 532 |
+structure (note however that unlike Xsizehints, the graphics context is |
| 533 |
created using the X function XCreateGC. The reason is that X provides |
| 534 |
a means of creating this structure, while the 'make' facility is |
| 535 |
provided to make C's struct in lisp). The fields in the structure is |
| 536 |
@@ -319,7 +319,7 @@ windows in the root window. |
| 537 |
the display, the window being managed, the window name, and the icon |
| 538 |
name. XSetStandardProperties also expects three other parameters, an |
| 539 |
icon_pixmap, which will represent the window when it is iconized, and |
| 540 |
-two arguments coressponding to resource information. Both these |
| 541 |
+two arguments corresponding to resource information. Both these |
| 542 |
featrues are beyond the scope of this paper (see 'Xlib Programming |
| 543 |
Manual for version 11' for more information). After |
| 544 |
XSetStandardProperties tells the window manager what to do, the window |
| 545 |
@@ -329,7 +329,7 @@ window on the screen. |
| 546 |
(Xmapwindow *default-display* a-window) |
| 547 |
|
| 548 |
The above function will map the window. Only one last |
| 549 |
-function needs to be caled for a window to appear on the screen. This |
| 550 |
+function needs to be called for a window to appear on the screen. This |
| 551 |
function is XFlush. This function, or another function that affects |
| 552 |
the event queue (discussed later) must be called whenever there is a |
| 553 |
drawing request for the X server. |
| 554 |
@@ -344,8 +344,8 @@ scaling measurements. Like most operati |
| 555 |
to change window attributes. The attributes could be changed directly |
| 556 |
by calling XChangeWindowAttributes with one of the parameters being a |
| 557 |
C structure, with the new information, and another parameter to |
| 558 |
-specifiy which attribute is being changed. This could be clumbersome |
| 559 |
-and inefficeint in lisp, but fortunately X usually provides a |
| 560 |
+specify which attribute is being changed. This could be clumbersome |
| 561 |
+and inefficient in lisp, but fortunately X usually provides a |
| 562 |
functional way of doing a task. Some functions for changing the |
| 563 |
window attributes are listed. Like most functions in X the names are |
| 564 |
self descriptive of the function. |
| 565 |
@@ -362,10 +362,10 @@ XDefineCursor |
| 566 |
|
| 567 |
|
| 568 |
As can be seen, the regularity in nameing conventions of X |
| 569 |
-routines. Only the function XSelectInput will be discussd in this |
| 570 |
+routines. Only the function XSelectInput will be discussed in this |
| 571 |
report (see section E). The list shown is meant to demonstrate how X |
| 572 |
-names functions, and how X can provid for functional equivalents for |
| 573 |
-most operations. (Ofcourse any function that is not provided by X can |
| 574 |
+names functions, and how X can provide for functional equivalents for |
| 575 |
+most operations. (Of course any function that is not provided by X can |
| 576 |
be written in lisp using primitive operations like |
| 577 |
XChangeWindowAttributes. The same applies for all objects in X.) |
| 578 |
|
| 579 |
@@ -386,16 +386,16 @@ is an example of a call to XGetGeometry. |
| 580 |
*height-return* *border-width-return* *depth-return*) |
| 581 |
|
| 582 |
The values that are returned by XGetGeometry is pointed to by |
| 583 |
-the parameters that are denoted by teh word 'return'. A root of a |
| 584 |
+the parameters that are denoted by the word 'return'. A root of a |
| 585 |
window can be extracted, along with it's position, and size. Its |
| 586 |
border width can also be returned, along with it's depth ( a depth |
| 587 |
tells X how many colors can be drawn for a drawble). This functions |
| 588 |
-also demonstrates how poitners are used in Xakcl to return multiple |
| 589 |
+also demonstrates how pointers are used in Xakcl to return multiple |
| 590 |
values. It is necessary to allocate an area of memory in order to |
| 591 |
write into that memory locations. The functions int-array and |
| 592 |
char-array will create a C array of integers and characters |
| 593 |
respectively. A pointer to the array is returned. XGetGemoetry |
| 594 |
-expects pointers to integers so it is necessary to alocate integer |
| 595 |
+expects pointers to integers so it is necessary to allocate integer |
| 596 |
arrays of one element. For example: |
| 597 |
|
| 598 |
|
| 599 |
@@ -449,7 +449,7 @@ i. XSetBackGround and XSetForeGround. |
| 600 |
XSetForeground and XSetBackground sets the foreground and |
| 601 |
background pixel as mentioned in section A. In order to Allocate a |
| 602 |
pixel besides black and white, a call to XAllocNamedColor must be |
| 603 |
-done. XAllocNamedColor needs two Xcolor structrues, so they must be |
| 604 |
+done. XAllocNamedColor needs two Xcolor structures, so they must be |
| 605 |
created as well. For example: |
| 606 |
|
| 607 |
(setq pixel-xcolor (make-Xcolor)) |
| 608 |
@@ -457,7 +457,7 @@ created as well. For example: |
| 609 |
(XAllocNamedColor display colormap (get-c-string color) pixel-xcolor exact-rgb) |
| 610 |
|
| 611 |
The above function will return a pixel value in the structure |
| 612 |
-pixel-color. this informaion can be extracted with (Xcolor-pixel |
| 613 |
+pixel-color. this information can be extracted with (Xcolor-pixel |
| 614 |
pixel-xcolor). XAllocNamedColo also expects a colormap (the default |
| 615 |
colormap will do), a display, and a String specifying the color (for a |
| 616 |
list of colors see the file rgb.txt in /usr/lib/X11). Thus the |
| 617 |
@@ -466,8 +466,8 @@ color. |
| 618 |
|
| 619 |
(Xsetforeground display GC (Xcolor-pixel pixel-xcolor)) |
| 620 |
|
| 621 |
- Similair to Xsetforeground, XSetBackGround will cause all |
| 622 |
-drawings needing the background color to use the sepcified pixel |
| 623 |
+ Similar to Xsetforeground, XSetBackGround will cause all |
| 624 |
+drawings needing the background color to use the specified pixel |
| 625 |
value. |
| 626 |
|
| 627 |
|
| 628 |
@@ -486,7 +486,7 @@ the way lines join. The width is an int |
| 629 |
cap-style and join-style are constants. The default styles are |
| 630 |
LineSolid, CapButt, and JoinMitter. This will make lines appear |
| 631 |
solid. They will join at a sharp angle and the lines will end in a |
| 632 |
-flat edge. See any X refernce manual for the complete options on the |
| 633 |
+flat edge. See any X reference manual for the complete options on the |
| 634 |
line styles. |
| 635 |
|
| 636 |
|
| 637 |
@@ -514,7 +514,7 @@ fid). |
| 638 |
|
| 639 |
iv. XSetFunction |
| 640 |
|
| 641 |
- Xwindows draws by applying bit operations on the pixel vlaues |
| 642 |
+ Xwindows draws by applying bit operations on the pixel values |
| 643 |
on the screen along with a mask that it creates called the plan_mask. |
| 644 |
Most often only the pixel already on the screen is manipulated. This |
| 645 |
default logical operation is GXcopy (which is the default). However |
| 646 |
@@ -528,9 +528,9 @@ specified with a call to XSetFunction. |
| 647 |
The above function will make X draw ghost images in mono color |
| 648 |
screens using the function Xor. The pixel value on the screen is |
| 649 |
Xored with the pixel value of the plan_mask (which is derived from the |
| 650 |
-foregroudn color). On color screens the foregorund color must be set |
| 651 |
+foreground color). On color screens the foreground color must be set |
| 652 |
to (logxor foreground-pixel background-pixel) in order for ghosting |
| 653 |
-effects to occurr. Below is the complete function for ghosting |
| 654 |
+effects to occur. Below is the complete function for ghosting |
| 655 |
effects. |
| 656 |
|
| 657 |
(Xsetforeground *default-display* *default-GC* (logxor foreground-pixel background-pixel )) |
| 658 |
@@ -541,7 +541,7 @@ II. Getting Information from the Graphi |
| 659 |
|
| 660 |
In the above function, the foreground-pixel and |
| 661 |
background-pixel must be extracted from the graphics context. In |
| 662 |
-order to get information from the graphcis context the function |
| 663 |
+order to get information from the graphics context the function |
| 664 |
XGetGCVlues must be used. XGetGCVlues is an example of a X function |
| 665 |
that expects a structure, and a value mask. Below are functions for |
| 666 |
extracted the foreground color from the graphics context. Other |
| 667 |
@@ -591,7 +591,7 @@ request. |
| 668 |
II. Drawing Rectangles |
| 669 |
|
| 670 |
Drawing Rectangles is similar to drawing lines. The only |
| 671 |
-difference is that the size of the recatangle must be specified. |
| 672 |
+difference is that the size of the rectangle must be specified. |
| 673 |
|
| 674 |
|
| 675 |
(XDrawRectangle *default-display* a-window *default-GC* |
| 676 |
@@ -604,7 +604,7 @@ The function expects the x and y positio |
| 677 |
|
| 678 |
II. Drawing Arcs. |
| 679 |
|
| 680 |
- Arcs can form enclosed areas such as elipses or cirlces or |
| 681 |
+ Arcs can form enclosed areas such as ellipses or circles or |
| 682 |
they could be a curved line. The function XDrawArc will draw arcs. |
| 683 |
|
| 684 |
|
| 685 |
@@ -613,7 +613,7 @@ they could be a curved line. The functi |
| 686 |
|
| 687 |
This function call will draw a circle. The Arc will be |
| 688 |
bounded by a rectangle. The points 100 100 correspond to the upper |
| 689 |
-left edge of the recatangle. 10 and 10 specifies the width and height |
| 690 |
+left edge of the rectangle. 10 and 10 specifies the width and height |
| 691 |
respectively. The starting and ending position of the arc must also |
| 692 |
be specified. These two points are in sixty-fourths of a degrees. |
| 693 |
The first angle is relative to the three-o'clock position and the |
| 694 |
@@ -630,18 +630,18 @@ III. Drawing Text |
| 695 |
|
| 696 |
With the font loaded in the Graphics Context as shown in |
| 697 |
Section C, several functions can be called in order to draw text. |
| 698 |
-Only XDrawString will be dicussed here, but the other functions are |
| 699 |
+Only XDrawString will be discussed here, but the other functions are |
| 700 |
similar. |
| 701 |
|
| 702 |
(XDrawString *default-display* a-window *default-GC* 10 15 (get-c-string "hello") 4) |
| 703 |
(Xflush *default-display*) |
| 704 |
|
| 705 |
The above function will draw the string 'hello' at positions |
| 706 |
-10, 15 with the font specified in the default grpahics context. |
| 707 |
+10, 15 with the font specified in the default graphics context. |
| 708 |
XDrawString also expects the length of the string (in this case 4), |
| 709 |
and the display. |
| 710 |
|
| 711 |
- Often it is necesssary to the size of the string (the |
| 712 |
+ Often it is necessary to the size of the string (the |
| 713 |
rectangle that bounds the string). This can be done with a call to |
| 714 |
XTextExtents. |
| 715 |
|
| 716 |
@@ -664,9 +664,9 @@ width (an ascent tells how far above a b |
| 717 |
while the descent tells how far below). After a call to XTextExtents, |
| 718 |
the ascent will be have the maximum ascent of all the characters in |
| 719 |
the string. Likewise the descent will have the maximum descent of all |
| 720 |
-the characters. The width will be the sum of the characer width of |
| 721 |
+the characters. The width will be the sum of the character width of |
| 722 |
all the characters in the string (thus the width of the string in |
| 723 |
-number of pixels). From this information, the user shouldbe able to |
| 724 |
+number of pixels). From this information, the user should be able to |
| 725 |
position text precisely on the screen. |
| 726 |
|
| 727 |
|
| 728 |
@@ -677,15 +677,15 @@ E. Handling Events |
| 729 |
|
| 730 |
So far only request to the X server to do output on the screen |
| 731 |
have been discussed. X also has a means of getting information about |
| 732 |
-what is inputed by a user as well. The inputs can range from moving |
| 733 |
+what is inputted by a user as well. The inputs can range from moving |
| 734 |
or clicking the mouse to keys being pressed on the keyboard. The |
| 735 |
-input also encompases events like a window being uncovered or exposed |
| 736 |
+input also encompasses events like a window being uncovered or exposed |
| 737 |
by another window, or a window being resized. |
| 738 |
|
| 739 |
|
| 740 |
I. Setting the Input |
| 741 |
|
| 742 |
- These inputs are called Events. The Events themseleves only |
| 743 |
+ These inputs are called events. The events themselves only |
| 744 |
have meaning when they pertain to a window. In other words, events |
| 745 |
occur in windows. Thus an attribute of the window must be set. The |
| 746 |
function XSelectInput must be used. |
| 747 |
@@ -698,7 +698,7 @@ Events, PointerMotion Events, and Exposu |
| 748 |
seen this is specified using mask (for other mask see a Xlib manual or |
| 749 |
the file X.lsp or X.h). |
| 750 |
|
| 751 |
- After Specifiying the input, all events that occur in that |
| 752 |
+ After specifying the input, all events that occur in that |
| 753 |
will go on the event queue. The event queue is a queue of what events |
| 754 |
have occurred, the first one being on top. The client can both get |
| 755 |
information form the queue and manipulate the queue. |
| 756 |
@@ -762,12 +762,12 @@ XSync can be used to do this. For examp |
| 757 |
|
| 758 |
F. Conclusion |
| 759 |
|
| 760 |
- With the commands demonstarted in this tutorial, most |
| 761 |
+ With the commands demonstrated in this tutorial, most |
| 762 |
applications can be managed. Windows can be created, and graphics |
| 763 |
operations can be performed. For more complex applications a widget |
| 764 |
set can be created similar to the X Intrinsics library and the Athena |
| 765 |
Widget Set. For a lisp like implementation of widgets and an advance |
| 766 |
-aplications see the GWM application, in the GWM Manual by Colas |
| 767 |
+applications see the GWM application, in the GWM Manual by Colas |
| 768 |
Nahaboo. GWM is a generic window manager, that is similar to Xakcl. |
| 769 |
It supports objects that are similar to Widgets in most C Xwindows |
| 770 |
libraries. |
| 771 |
--- gcl-2.6.14.orig/xgcl-2/gcl_Xakcl.example.lsp |
| 772 |
+++ gcl-2.6.14/xgcl-2/gcl_Xakcl.example.lsp |
| 773 |
@@ -227,7 +227,7 @@ |
| 774 |
;;the drawing goes so fast that you can't see the text invert, so the |
| 775 |
;;function wiats for for about .2 seconds. but it would be better to |
| 776 |
;;keep the text inverted until the button is released this is done by |
| 777 |
-;;setting the quit window to have buton release events as well and |
| 778 |
+;;setting the quit window to have button release events as well and |
| 779 |
;;handling it appropriately |
| 780 |
|
| 781 |
(dotimes (i 1500)) |
| 782 |
--- gcl-2.6.14.orig/xgcl-2/gcl_Xinit.lsp |
| 783 |
+++ gcl-2.6.14/xgcl-2/gcl_Xinit.lsp |
| 784 |
@@ -27,10 +27,10 @@ |
| 785 |
;;large extent. it would be beneficial to use a X 11 version 4, manual |
| 786 |
;;in order to look up functions. the only unique functions of Xakcl are those |
| 787 |
;;that involove manipulating C structs. all functions involved in creating |
| 788 |
-;;a C struct in X starts with a 'make' followed by the structure name. all |
| 789 |
+;;a C struct in X starts with a 'make' followed by the structure name. All |
| 790 |
;;functions involved in getting a field of a C struct strats with the |
| 791 |
;;name of the C struct followed by the name of the field. the |
| 792 |
-;;parameters it excepts is the variable contaning the structure. all |
| 793 |
+;;parameters it excepts is the variable containing the structure. All |
| 794 |
;;functions to set a field of a C struct starts with 'set' followed by |
| 795 |
;;the C struct name followed by the field name. these functions accept |
| 796 |
;;as parameter, the variable containing the struct and the value to be |
| 797 |
@@ -102,8 +102,8 @@ |
| 798 |
|
| 799 |
|
| 800 |
;;;;;;;;;;;;;;;;;;;;;; |
| 801 |
-;;this is an example of creating a window. this function takes care of |
| 802 |
-;;positioning, size and other attirbutes of the window. |
| 803 |
+;;This is an example of creating a window. This function takes care of |
| 804 |
+;;positioning, size and other attributes of the window. |
| 805 |
|
| 806 |
(defun open-window(&key (pos-x *pos-x* ) (pos-y *pos-y*) (win-width *win-width*) |
| 807 |
(win-height *win-height* ) |
| 808 |
@@ -134,7 +134,7 @@ |
| 809 |
(Xmapwindow *default-display* a-window) |
| 810 |
|
| 811 |
;;the X server needs to have the output buffer sent to it before it can |
| 812 |
-;;process requests. this is acomplished with XFlush or functions that |
| 813 |
+;;process requests. this is accomplished with XFlush or functions that |
| 814 |
;;read and manipulate the event queue. remember to do this after |
| 815 |
;;operations that won't be calling an eventhandling function |
| 816 |
|
| 817 |
--- gcl-2.6.14.orig/xgcl-2/gcl_sysinit.lsp |
| 818 |
+++ gcl-2.6.14/xgcl-2/gcl_sysinit.lsp |
| 819 |
@@ -61,7 +61,7 @@ |
| 820 |
|
| 821 |
;; invoke this to initialize maxima. |
| 822 |
|
| 823 |
-;; make this if you dont want the invocation done automatically. |
| 824 |
+;; make this if you don't want the invocation done automatically. |
| 825 |
;(defentry user::user-init () "user_init") |
| 826 |
|
| 827 |
|