From 8ec8f3043c5cf6be90ef0489d68b85744428bd2c Mon Sep 17 00:00:00 2001 From: Danny Yoo Date: Fri, 19 Aug 2011 14:41:33 -0400 Subject: [PATCH] adding some tests --- Makefile | 26 +++++------- .../runtime-src/baselib-primitives.js | 40 +++++++++++++++++++ lang/kernel.rkt | 6 +-- make-last-commit-name.rkt | 20 ---------- resource/compile-time.rkt | 4 ++ scribblings/manual.scrbl | 13 ++++-- scribblings/scribble-helpers.rkt | 1 + tests/more-tests/string-tests.expected | 9 +++++ tests/more-tests/string-tests.rkt | 13 ++++++ 9 files changed, 91 insertions(+), 41 deletions(-) delete mode 100755 make-last-commit-name.rkt diff --git a/Makefile b/Makefile index 7486deb..770dca6 100644 --- a/Makefile +++ b/Makefile @@ -2,51 +2,47 @@ # raco make -v --disable-inline test-analyzer.rkt # racket test-analyzer.rkt -launcher: last-commit-name +launcher: raco make -v --disable-inline whalesong.rkt racket make-launcher.rkt -whalesong: last-commit-name +whalesong: raco make -v --disable-inline whalesong.rkt -test-all: last-commit-name +test-all: raco make -v --disable-inline tests/test-all.rkt racket tests/test-all.rkt -test-browser-evaluate: last-commit-name +test-browser-evaluate: raco make -v --disable-inline tests/test-browser-evaluate.rkt racket tests/test-browser-evaluate.rkt -test-compiler: last-commit-name +test-compiler: raco make -v --disable-inline tests/test-compiler.rkt racket tests/test-compiler.rkt -test-parse-bytecode-on-collects: last-commit-name +test-parse-bytecode-on-collects: raco make -v --disable-inline tests/test-parse-bytecode-on-collects.rkt racket tests/test-parse-bytecode-on-collects.rkt -test-earley: last-commit-name +test-earley: raco make -v --disable-inline tests/test-earley.rkt racket tests/test-earley.rkt -test-conform: last-commit-name +test-conform: raco make -v --disable-inline tests/test-conform.rkt racket tests/test-conform.rkt -test-more: last-commit-name +test-more: raco make -v --disable-inline tests/run-more-tests.rkt racket tests/run-more-tests.rkt - -last-commit-name: - racket make-last-commit-name.rkt - -doc: last-commit-name +doc: scribble ++xref-in setup/xref load-collections-xref --redirect-main http://docs.racket-lang.org/ --dest generated-docs --dest-name index.html scribblings/manual.scrbl -setup: last-commit-name +setup: raco setup -P dyoo whalesong.plt 1 2 diff --git a/js-assembler/runtime-src/baselib-primitives.js b/js-assembler/runtime-src/baselib-primitives.js index 0fb018a..815124e 100644 --- a/js-assembler/runtime-src/baselib-primitives.js +++ b/js-assembler/runtime-src/baselib-primitives.js @@ -649,6 +649,33 @@ }); + installPrimitiveProcedure( + 'string', + baselib.arity.arityAtLeast(0), + function (MACHINE) { + var i; + var chars = []; + for (i = 0; i < MACHINE.argcount; i++) { + chars.push(checkChar(MACHINE, 'string', i).val); + }; + return chars.join(''); + }); + + + installPrimitiveProcedure( + 'string->list', + 1, + function (MACHINE) { + var str = checkString(MACHINE, 'string->list', 0); + var i; + var result = NULL; + for (i = 0; i < str.length; i++) { + result = makePair(baselib.chars.makeChar(elts[elts.length - 1 - i]), result); + } + return result; + }); + + installPrimitiveProcedure( 'string-set!', @@ -736,6 +763,19 @@ }); + installPrimitiveProcedure( + 'string-ref', + 2, + function (MACHINE) { + var firstArg = checkString(MACHINE, 'string-ref', 0).toString(); + var index = baselib.numbers.toFixnum( + checkNaturalInRange(MACHINE, 'string-ref', 0, + 0, firstArg.length)); + return baselib.chars.makeChar(firstArg[index]); + }); + + + installPrimitiveProcedure( 'string?', 1, diff --git a/lang/kernel.rkt b/lang/kernel.rkt index 5954d0e..806175a 100644 --- a/lang/kernel.rkt +++ b/lang/kernel.rkt @@ -340,9 +340,9 @@ memq ;; hash-map ;; hash-for-each make-string -;; string + string string-length -;; string-ref + string-ref string=? ;; string-ci=? ;; string=? substring string-append -;; string->list + string->list list->string ;; string-copy string->symbol diff --git a/make-last-commit-name.rkt b/make-last-commit-name.rkt deleted file mode 100755 index 17b59f4..0000000 --- a/make-last-commit-name.rkt +++ /dev/null @@ -1,20 +0,0 @@ -#lang racket/base - -(require racket/runtime-path) -(define-runtime-path git-head-path ".git/refs/heads/master") -(define-runtime-path last-commit-name.rkt "last-commit-name.rkt") - -(call-with-input-file git-head-path - (lambda (ip) - (call-with-output-file last-commit-name.rkt - (lambda (op) - (fprintf op "#lang racket/base - -;; This file is automatically generated by make-last-commit-name.rkt. -;; Do not edit this file by hand. - -(provide (all-defined-out)) -(define git-head ~s) -" -(read-line ip))) - #:exists 'replace))) \ No newline at end of file diff --git a/resource/compile-time.rkt b/resource/compile-time.rkt index 9a26d6e..04fa17c 100644 --- a/resource/compile-time.rkt +++ b/resource/compile-time.rkt @@ -15,6 +15,10 @@ ;; (define-syntax (define-resource stx) (syntax-parse stx + [(_ name:id) + (with-syntax ([path (symbol->string #'name)]) + (syntax/loc stx + (define-resource name path)))] [(_ name:id path:str) (let* ([normal-path (normalize-path (build-path diff --git a/scribblings/manual.scrbl b/scribblings/manual.scrbl index bfc2ddb..1068c4d 100644 --- a/scribblings/manual.scrbl +++ b/scribblings/manual.scrbl @@ -4,12 +4,16 @@ planet/resolver scribble/eval racket/sandbox + racket/port (only-in racket/contract any/c) racket/runtime-path "scribble-helpers.rkt" - "../last-commit-name.rkt" "../js-assembler/get-js-vm-implemented-primitives.rkt") +@(require racket/runtime-path) +@(define-runtime-path git-head-path "../.git/refs/heads/master") + + @(require (for-label (this-package-in js)) (for-label (this-package-in lang/base)) (for-label (this-package-in resource))) @@ -54,7 +58,10 @@ @url{https://github.com/dyoo/whalesong}. The latest version of this document lives in @url{http://hashcollision.org/whalesong}.}} -@centered{@smaller{Current commit head is @tt{@git-head}.}} +@(if (file-exists? git-head-path) + (let ([git-head (call-with-input-file git-head-path port->string)]) + @centered{@smaller{Current commit head is @tt{@git-head}.}}) + "") @@ -442,7 +449,7 @@ get-javascript depend on. -@section{Including external resources with @racketmodname/this-package[resource]} +@section{Including external resources} @defmodule/this-package[resource] Programs may need to use external file resources that aren't diff --git a/scribblings/scribble-helpers.rkt b/scribblings/scribble-helpers.rkt index 9547bfd..4025640 100644 --- a/scribblings/scribble-helpers.rkt +++ b/scribblings/scribble-helpers.rkt @@ -9,6 +9,7 @@ scriblib/render-cond) + ;; Adds JavaScript if we're rendering in HTML. (define (inject-javascript-inline . body) (cond-element diff --git a/tests/more-tests/string-tests.expected b/tests/more-tests/string-tests.expected index 4e9e5fe..de48441 100644 --- a/tests/more-tests/string-tests.expected +++ b/tests/more-tests/string-tests.expected @@ -13,3 +13,12 @@ "lo" "" "hello" +"" +"abc" +#\h +#\e +#\l +#\o +(list #\x #\y #\z) +(list #\x) +(list) diff --git a/tests/more-tests/string-tests.rkt b/tests/more-tests/string-tests.rkt index a0227aa..e950677 100644 --- a/tests/more-tests/string-tests.rkt +++ b/tests/more-tests/string-tests.rkt @@ -17,3 +17,16 @@ (list->string '()) (list->string '(#\h #\e #\l #\l #\o)) + + +(string) +(string #\a #\b #\c) + +(string-ref "hello" 0) +(string-ref "hello" 1) +(string-ref "hello" 2) +(string-ref "hello" 4) + +(string->list "xyz") +(string->list "x") +(string->list "")