Import Upstream version 5e4upstream/5e4

1 files changed, 12 insertions, 11 deletions

diff --git a/hobbit.scm b/hobbit.scm
index 5505bf1..eff85ba 100644
--- a/hobbit.scm
+++ b/hobbit.scm
@@ -6,7 +6,7 @@
 ;                   2002-04-11

 ;

 ;                   Copyright (C) 1992-1997: Tanel Tammet

-;                   Copyright (C) 1998-2002: Free Software Foundation

+;                   Copyright (C) 1998-2006: Free Software Foundation

 ;

 ;	    tammet@staff.ttu.ee, tammet@cs.chalmers.se

 ;

@@ -228,7 +228,7 @@
  errjmp-ok ints-disabled sig-deferred alrm-deferred han-sig han-alrm

  must-malloc ilength s-read s-write s-newline s-make-string

  s-make-vector s-list s-string s-vector repl-driver newsmob lthrow repl

- gc-end gc-start growth-mon iprin1 intprint iprlist lputc lputs

+ gc-end gc-start growth-mon scm_iprin1 scm_intprint scm_iprlist lputc lputs

  lfwrite time-in-msec my-time init-tables init-storage init-subrs

  init-features init-iprocs init- init-scl init-io init-repl init-time

  init-signals ignore-signals unignore-signals init-eval init-sc2

@@ -259,8 +259,9 @@
 ;;; eval

  throwval quit input-portp output-portp

  cur-input-port cur-output-port open-file open-pipe close-port

- close-pipe lread read-char peek-char eof-objectp lwrite display

- newline write-char file-position file-set-position lgetenv prog-args

+ close-pipe read-char peek-char eof-objectp scm_write scm_display

+ scm_newline scm_write-char

+ file-position file-set-position scm_file-position lgetenv prog-args

  makacro makmacro makmmacro

  remove ash round array-ref array_ref

  sin cos tan asin acos atan sinh cosh tanh asinh acosh atanh sqrt expt

@@ -2115,7 +2116,7 @@
 	  ;;   (display-c-newline))

 	  ((eq? 'if (car term))

 	   (display-c-indent n)

-	   (display-c "if(")

+	   (display-c "if (")

 	   (display-c-expression (cadr term) #t)

 	   (display-c #\))

 	   (cond ((not (pair? (caddr term)))

@@ -2170,7 +2171,7 @@
 		  (display-c-statement (car (cdddr term)) n))))

 	  ((eq? (car term) *do-not*)

 	   (display-c-indent n)

-	   (display-c "for(")

+	   (display-c "for (")

 	   (let ((lst1 (map (lambda (x) (list 'set! (car x) (cadr x)))

 			    (cadr term)))

 		 (lst2 (map (lambda (x) (list 'set! (car x) (caddr x)))

@@ -2561,12 +2562,12 @@
 

      (read "scm_read" 1)

      (read-char "scm_read_char" 1)

-     (peek-char "peek_char" 1)

+     (peek-char "scm_peek_char" 1)

      (eof-object? "eof_objectp" 1)

-     (write "lwrite" 2)

-     (display "display" 2)

-     (newline "newline" 1)

-     (write-char "write_char" 2)

+     (write "scm_write" 2)

+     (display "scm_display" 2)

+     (newline "scm_newline" 1)

+     (write-char "scm_write_char" 2)

 

      (input-port? "input_portp" 1)

      (output-port? "output_portp" 1)