Skip to content

Commit

Permalink
Tweaked inlining of text? and version nickname.
Browse files Browse the repository at this point in the history
  • Loading branch information
WillClinger committed Aug 5, 2017
1 parent beedabf commit 567b862
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 10 deletions.
1 change: 1 addition & 0 deletions doc/UserManual/libraries.txt
Original file line number Diff line number Diff line change
Expand Up @@ -270,6 +270,7 @@ http://srfi.schemers.org/[SRFI] libraries:
(srfi 145) ; assumptions
(srfi 146) ; mappings
(srfi 151) ; bitwise operations
(srfi 152) ; string library (reduced)

[NOTE]
================================================================
Expand Down
12 changes: 6 additions & 6 deletions src/Compiler/common.imp.sch
Original file line number Diff line number Diff line change
Expand Up @@ -1814,14 +1814,14 @@
` ((_ larceny text? (text? obj0))
(let ((x obj0))
(and (structure? x)
(eq? (.vector-ref:trusted (.vector-ref:trusted x 0) 0)
larceny:text-rtd))))
(eq? (.vector-ref:trusted x 0)
larceny:text-inheritance-vector))))

` ((_ larceny text-length (text-length txt0))
(let ((txt txt0))
(.check! (structure? txt) ,$ex.tlen txt)
(.check! (eq? (.vector-ref:trusted (.vector-ref:trusted txt 0) 0)
larceny:text-rtd)
(.check! (eq? (.vector-ref:trusted txt 0)
larceny:text-inheritance-vector)
,$ex.tlen
txt)
(.fxrshl (.vector-ref:trusted txt 1) 7)))
Expand All @@ -1837,8 +1837,8 @@
(let ((txt txt0)
(i index0))
(.check! (structure? txt) ,$ex.tlen txt)
(.check! (eq? (.vector-ref:trusted (.vector-ref:trusted txt 0) 0)
larceny:text-rtd)
(.check! (eq? (.vector-ref:trusted txt 0)
larceny:text-inheritance-vector)
,$ex.tlen
txt)
(.check! (.fixnum? i) ,$ex.tref txt i)
Expand Down
5 changes: 5 additions & 0 deletions src/Lib/Common/text.sch
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,11 @@
(define larceny:the-empty-text
(%new-text 0 0 (vector (make-bytevector 0))))

;;; used by src/Compiler/common.imp.sch

(define larceny:text-inheritance-vector
(vector-like-ref larceny:the-empty-text 0))

;;; text? is defined by the record definition above.

(define (text-length txt)
Expand Down
3 changes: 2 additions & 1 deletion src/Lib/Common/toplevel.sch
Original file line number Diff line number Diff line change
Expand Up @@ -871,7 +871,8 @@
;; defined in text.sch but not exported by (scheme text)

(environment-set! larc 'larceny:text-complain larceny:text-complain)
(environment-set! larc 'larceny:text-rtd larceny:text-rtd)
(environment-set! larc 'larceny:text-inheritance-vector
larceny:text-inheritance-vector)
(environment-set! larc '%new-text %new-text)
(environment-set! larc 'larceny:text.k larceny:text.k)
(environment-set! larc 'larceny:text.chunks larceny:text.chunks)
Expand Down
6 changes: 3 additions & 3 deletions src/Rts/Sys/version.c
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
* General Ripper 0.98b1 21 Oct 2011 fcbaf3b
* 0.98 7 Mar 2015 60876f5
* Goldie 0.99 25 May 2016 4671a1f
* Grain Alcohol and Rainwater
* Grain Alcohol and Rainwater 1.3
* Group Commander Mandrake
* Hair Mussed
* Hi There!
Expand Down Expand Up @@ -71,8 +71,8 @@

int larceny_major_version = 1;
int larceny_minor_version = 3;
/* char *larceny_version_qualifier = " \"Grain Alcohol and Rainwater\""; */
char *larceny_version_qualifier = "b6";
char *larceny_version_qualifier = " \"Grain Alcohol and Rainwater\"";
/* char *larceny_version_qualifier = "b6"; */

char *date = DATE " " TIME;
char *user = USER;
Expand Down

0 comments on commit 567b862

Please sign in to comment.