Skip to content

Commit 567b862

Browse files
committed
Tweaked inlining of text? and version nickname.
1 parent beedabf commit 567b862

File tree

5 files changed

+17
-10
lines changed

5 files changed

+17
-10
lines changed

doc/UserManual/libraries.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -270,6 +270,7 @@ http://srfi.schemers.org/[SRFI] libraries:
270270
(srfi 145) ; assumptions
271271
(srfi 146) ; mappings
272272
(srfi 151) ; bitwise operations
273+
(srfi 152) ; string library (reduced)
273274

274275
[NOTE]
275276
================================================================

src/Compiler/common.imp.sch

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1814,14 +1814,14 @@
18141814
` ((_ larceny text? (text? obj0))
18151815
(let ((x obj0))
18161816
(and (structure? x)
1817-
(eq? (.vector-ref:trusted (.vector-ref:trusted x 0) 0)
1818-
larceny:text-rtd))))
1817+
(eq? (.vector-ref:trusted x 0)
1818+
larceny:text-inheritance-vector))))
18191819

18201820
` ((_ larceny text-length (text-length txt0))
18211821
(let ((txt txt0))
18221822
(.check! (structure? txt) ,$ex.tlen txt)
1823-
(.check! (eq? (.vector-ref:trusted (.vector-ref:trusted txt 0) 0)
1824-
larceny:text-rtd)
1823+
(.check! (eq? (.vector-ref:trusted txt 0)
1824+
larceny:text-inheritance-vector)
18251825
,$ex.tlen
18261826
txt)
18271827
(.fxrshl (.vector-ref:trusted txt 1) 7)))
@@ -1837,8 +1837,8 @@
18371837
(let ((txt txt0)
18381838
(i index0))
18391839
(.check! (structure? txt) ,$ex.tlen txt)
1840-
(.check! (eq? (.vector-ref:trusted (.vector-ref:trusted txt 0) 0)
1841-
larceny:text-rtd)
1840+
(.check! (eq? (.vector-ref:trusted txt 0)
1841+
larceny:text-inheritance-vector)
18421842
,$ex.tlen
18431843
txt)
18441844
(.check! (.fixnum? i) ,$ex.tref txt i)

src/Lib/Common/text.sch

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,11 @@
9797
(define larceny:the-empty-text
9898
(%new-text 0 0 (vector (make-bytevector 0))))
9999

100+
;;; used by src/Compiler/common.imp.sch
101+
102+
(define larceny:text-inheritance-vector
103+
(vector-like-ref larceny:the-empty-text 0))
104+
100105
;;; text? is defined by the record definition above.
101106

102107
(define (text-length txt)

src/Lib/Common/toplevel.sch

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -871,7 +871,8 @@
871871
;; defined in text.sch but not exported by (scheme text)
872872

873873
(environment-set! larc 'larceny:text-complain larceny:text-complain)
874-
(environment-set! larc 'larceny:text-rtd larceny:text-rtd)
874+
(environment-set! larc 'larceny:text-inheritance-vector
875+
larceny:text-inheritance-vector)
875876
(environment-set! larc '%new-text %new-text)
876877
(environment-set! larc 'larceny:text.k larceny:text.k)
877878
(environment-set! larc 'larceny:text.chunks larceny:text.chunks)

src/Rts/Sys/version.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
* General Ripper 0.98b1 21 Oct 2011 fcbaf3b
3030
* 0.98 7 Mar 2015 60876f5
3131
* Goldie 0.99 25 May 2016 4671a1f
32-
* Grain Alcohol and Rainwater
32+
* Grain Alcohol and Rainwater 1.3
3333
* Group Commander Mandrake
3434
* Hair Mussed
3535
* Hi There!
@@ -71,8 +71,8 @@
7171

7272
int larceny_major_version = 1;
7373
int larceny_minor_version = 3;
74-
/* char *larceny_version_qualifier = " \"Grain Alcohol and Rainwater\""; */
75-
char *larceny_version_qualifier = "b6";
74+
char *larceny_version_qualifier = " \"Grain Alcohol and Rainwater\"";
75+
/* char *larceny_version_qualifier = "b6"; */
7676

7777
char *date = DATE " " TIME;
7878
char *user = USER;

0 commit comments

Comments
 (0)