CMUCL commit: intl-branch src (5 files)
Raymond Toy
rtoy at common-lisp.net
Wed Feb 10 03:04:05 CET 2010
Date: Tuesday, February 9, 2010 @ 21:04:05
Author: rtoy
Path: /project/cmucl/cvsroot/src
Tag: intl-branch
Modified: code/query.lisp code/rand-mt19937.lisp code/reader.lisp
code/remote.lisp i18n/locale/ko/LC_MESSAGES/cmucl.mo
Mark translatable strings; update cmucl.pot and ko/cmucl.po
accordingly.
-------------------------------------+
code/query.lisp | 10 +-
code/rand-mt19937.lisp | 12 +-
code/reader.lisp | 142 +++++++++++++++++-----------------
code/remote.lisp | 18 ++--
i18n/locale/ko/LC_MESSAGES/cmucl.mo | <<Binary file>>
5 files changed, 92 insertions(+), 91 deletions(-)
Index: src/code/query.lisp
diff -u src/code/query.lisp:1.5.56.1 src/code/query.lisp:1.5.56.2
--- src/code/query.lisp:1.5.56.1 Mon Feb 8 12:15:48 2010
+++ src/code/query.lisp Tue Feb 9 21:04:05 2010
@@ -5,7 +5,7 @@
;;; Carnegie Mellon University, and has been placed in the public domain.
;;;
(ext:file-comment
- "$Header: /project/cmucl/cvsroot/src/code/query.lisp,v 1.5.56.1 2010-02-08 17:15:48 rtoy Exp $")
+ "$Header: /project/cmucl/cvsroot/src/code/query.lisp,v 1.5.56.2 2010-02-10 02:04:05 rtoy Exp $")
;;;
;;; **********************************************************************
;;;
@@ -32,7 +32,7 @@
;;; Y-OR-N-P -- Public.
;;;
(defun y-or-n-p (&optional format-string &rest arguments)
- "Y-OR-N-P prints the message, if any, and reads characters from *QUERY-IO*
+ _N"Y-OR-N-P prints the message, if any, and reads characters from *QUERY-IO*
until the user enters y or Y as an affirmative, or either n or N as a
negative answer. It ignores preceding whitespace and asks again if you
enter any other characters."
@@ -49,7 +49,7 @@
((#\y #\Y) (return t))
((#\n #\N) (return nil))
(t
- (write-line "Type \"y\" for yes or \"n\" for no. " *query-io*)
+ (write-line _"Type \"y\" for yes or \"n\" for no. " *query-io*)
(when format-string
(apply #'format *query-io* format-string arguments))
(force-output *query-io*)))))))
@@ -60,7 +60,7 @@
;;; uses READ-LINE to get "YES" or "NO".
;;;
(defun yes-or-no-p (&optional format-string &rest arguments)
- "YES-OR-NO-P is similar to Y-OR-N-P, except that it clears the
+ _N"YES-OR-NO-P is similar to Y-OR-N-P, except that it clears the
input buffer, beeps, and uses READ-LINE to get the strings
YES or NO."
(clear-input *query-io*)
@@ -73,6 +73,6 @@
(cond ((string-equal ans "YES") (return t))
((string-equal ans "NO") (return nil))
(t
- (write-line "Type \"yes\" for yes or \"no\" for no. " *query-io*)
+ (write-line _"Type \"yes\" for yes or \"no\" for no. " *query-io*)
(when format-string
(apply #'format *query-io* format-string arguments))))))
Index: src/code/rand-mt19937.lisp
diff -u src/code/rand-mt19937.lisp:1.20.14.1 src/code/rand-mt19937.lisp:1.20.14.2
--- src/code/rand-mt19937.lisp:1.20.14.1 Mon Feb 8 12:15:48 2010
+++ src/code/rand-mt19937.lisp Tue Feb 9 21:04:05 2010
@@ -6,7 +6,7 @@
;;; placed in the Public domain, and is provided 'as is'.
;;;
(ext:file-comment
- "$Header: /project/cmucl/cvsroot/src/code/rand-mt19937.lisp,v 1.20.14.1 2010-02-08 17:15:48 rtoy Exp $")
+ "$Header: /project/cmucl/cvsroot/src/code/rand-mt19937.lisp,v 1.20.14.2 2010-02-10 02:04:05 rtoy Exp $")
;;;
;;; **********************************************************************
;;;
@@ -177,7 +177,7 @@
;;
(defun init-random-state (&optional (seed 5489) state)
- "Generate an random state vector from the given SEED. The seed can be
+ _N"Generate an random state vector from the given SEED. The seed can be
either an integer or a vector of (unsigned-byte 32)"
(declare (type (or null integer
(array (unsigned-byte 32) (*)))
@@ -196,7 +196,7 @@
(defvar *random-state* (make-random-object))
(defun make-random-state (&optional state)
- "Make a random state object. If STATE is not supplied, return a copy
+ _N"Make a random state object. If STATE is not supplied, return a copy
of the default random state. If STATE is a random state, then return a
copy of it. If STATE is T then return a random state generated from
the universal time or /dev/urandom if available."
@@ -211,7 +211,7 @@
((random-state-p state) (copy-random-state state))
((eq state t)
(make-random-object :state (init-random-state (generate-seed 627))))
- (t (error "Argument is not a RANDOM-STATE, T or NIL: ~S" state)))))
+ (t (error _"Argument is not a RANDOM-STATE, T or NIL: ~S" state)))))
(defun rand-mt19937-initializer ()
(init-random-state (generate-seed)
@@ -440,7 +440,7 @@
(declare (fixnum count)))))
(defun random (arg &optional (state *random-state*))
- "Generate a uniformly distributed pseudo-random number between zero
+ _N"Generate a uniformly distributed pseudo-random number between zero
and Arg. State, if supplied, is the random state to use."
(declare (inline %random-single-float %random-double-float
#+long-float %long-float))
@@ -463,5 +463,5 @@
(t
(error 'simple-type-error
:expected-type '(or (integer 1) (float (0.0))) :datum arg
- :format-control "Argument is not a positive integer or a positive float: ~S"
+ :format-control _"Argument is not a positive integer or a positive float: ~S"
:format-arguments (list arg)))))
Index: src/code/reader.lisp
diff -u src/code/reader.lisp:1.64.2.1 src/code/reader.lisp:1.64.2.2
--- src/code/reader.lisp:1.64.2.1 Mon Feb 8 12:15:48 2010
+++ src/code/reader.lisp Tue Feb 9 21:04:05 2010
@@ -5,7 +5,7 @@
;;; Carnegie Mellon University, and has been placed in the public domain.
;;;
(ext:file-comment
- "$Header: /project/cmucl/cvsroot/src/code/reader.lisp,v 1.64.2.1 2010-02-08 17:15:48 rtoy Exp $")
+ "$Header: /project/cmucl/cvsroot/src/code/reader.lisp,v 1.64.2.2 2010-02-10 02:04:05 rtoy Exp $")
;;;
;;; **********************************************************************
;;;
@@ -32,14 +32,14 @@
;;;Random global variables
-(defvar *read-default-float-format* 'single-float "Float format for 1.0E1")
+(defvar *read-default-float-format* 'single-float _N"Float format for 1.0E1")
(declaim (type (member short-float single-float double-float long-float)
*read-default-float-format*))
(defvar *readtable*)
(declaim (type readtable *readtable*))
(setf (documentation '*readtable* 'variable)
- "Variable bound to current readtable.")
+ _N"Variable bound to current readtable.")
;;;; Reader errors:
@@ -62,7 +62,7 @@
(reader-error-format-arguments condition))
nil error-stream
(file-position error-stream)))
- (format stream "Reader error ~@[at ~D ~]on ~S:~%~?"
+ (format stream _"Reader error ~@[at ~D ~]on ~S:~%~?"
(file-position error-stream) error-stream
(reader-error-format-control condition)
(reader-error-format-arguments condition))))))
@@ -81,7 +81,7 @@
((context :reader reader-eof-error-context :initarg :context))
(:report
(lambda (condition stream)
- (format stream "Unexpected EOF on ~S ~A."
+ (format stream _"Unexpected EOF on ~S ~A."
(stream-error-stream condition)
(reader-eof-error-context condition)))))
@@ -93,7 +93,7 @@
(defvar std-lisp-readtable ()
- "Standard lisp readtable. This is for recovery from broken
+ _N"Standard lisp readtable. This is for recovery from broken
read-tables, and should not normally be user-visible.")
;; Max size of the attribute table before we switch from an array to a
@@ -114,7 +114,7 @@
(declare (ignore d))
(print-unreadable-object (s stream :identity t)
(prin1 'readtable stream)))))
- "Readtable is a data structure that maps characters into syntax
+ _N"Readtable is a data structure that maps characters into syntax
types for the Common Lisp expression reader."
;; The CHARACTER-ATTRIBUTE-TABLE is a vector of ATTRIBUTE-TABLE-LIMIT integers for
;; describing the character type. Conceptually, there are 4 distinct
@@ -196,7 +196,7 @@
;;;; Package specials.
(defvar *old-package* ()
- "Value of *package* at the start of the last read or Nil.")
+ _N"Value of *package* at the start of the last read or Nil.")
;;; In case we get an error trying to parse a symbol, we want to rebind the
;;; above stuff so it's cool.
@@ -280,7 +280,7 @@
(defun undefined-macro-char (stream char)
(unless *read-suppress*
- (%reader-error stream "Undefined read-macro character ~S" char)))
+ (%reader-error stream _"Undefined read-macro character ~S" char)))
;;; The character attribute table is a CHAR-CODE-LIMIT vector of integers.
@@ -456,7 +456,7 @@
;;;; Readtable operations.
(defun copy-readtable (&optional (from-readtable *readtable*) to-readtable)
- "A copy is made of from-readtable and place into to-readtable."
+ _N"A copy is made of from-readtable and place into to-readtable."
(let ((from-readtable (or from-readtable std-lisp-readtable))
(to-readtable (or to-readtable (make-readtable))))
(flet ((copy-hash-table (to from)
@@ -486,7 +486,7 @@
(defun set-syntax-from-char (to-char from-char &optional
(to-readtable *readtable*)
(from-readtable ()))
- "Causes the syntax of to-char to be the same as from-char in the
+ _N"Causes the syntax of to-char to be the same as from-char in the
optional readtable (defaults to the current readtable). The
from-table defaults the standard lisp readtable by being nil."
(let ((from-readtable (or from-readtable std-lisp-readtable)))
@@ -527,7 +527,7 @@
(defun set-macro-character (char function &optional
(non-terminatingp nil) (rt *readtable*))
- "Causes char to be a macro character which invokes function when
+ _N"Causes char to be a macro character which invokes function when
seen by the reader. The non-terminatingp flag can be used to
make the macro character non-terminating. The optional readtable
argument defaults to the current readtable. Set-macro-character
@@ -539,7 +539,7 @@
T)
(defun get-macro-character (char &optional (rt *readtable*))
- "Returns the function associated with the specified char which is a macro
+ _N"Returns the function associated with the specified char which is a macro
character. The optional readtable argument defaults to the current
readtable."
(let ((rt (or rt std-lisp-readtable)))
@@ -675,7 +675,7 @@
;;; current read-buffer.
(defmacro with-read-buffer (() &body body)
- "Bind *read-buffer* to a fresh buffer and execute Body."
+ _N"Bind *read-buffer* to a fresh buffer and execute Body."
`(let* ((*read-buffer* (allocate-read-buffer))
(*read-buffer-length* (length *read-buffer*))
(*ouch-ptr* 0)
@@ -740,7 +740,7 @@
;;;; READ-PRESERVING-WHITESPACE, READ-DELIMITED-LIST, and READ.
(defvar *ignore-extra-close-parentheses* t
- "If true, only warn when there is an extra close paren, otherwise error.")
+ _N"If true, only warn when there is an extra close paren, otherwise error.")
(declaim (special *standard-input*))
@@ -783,7 +783,7 @@
(defun read-preserving-whitespace (&optional (stream *standard-input*)
(eof-errorp t) (eof-value nil)
(recursivep nil))
- "Reads from stream and returns the object read, preserving the whitespace
+ _N"Reads from stream and returns the object read, preserving the whitespace
that followed the object."
(with-read-buffer ()
(read-preserving-whitespace-internal stream eof-errorp eof-value recursivep)))
@@ -824,7 +824,7 @@
(defun read (&optional (stream *standard-input*) (eof-errorp t)
(eof-value ()) (recursivep ()))
- "Reads in the next object in the stream, which defaults to
+ _N"Reads in the next object in the stream, which defaults to
*standard-input*. For details see the I/O chapter of
the manual."
(with-read-buffer ()
@@ -843,7 +843,7 @@
(defun read-delimited-list (endchar &optional
(input-stream *standard-input*)
recursive-p)
- "Reads objects from input-stream until the next character after an
+ _N"Reads objects from input-stream until the next character after an
object's representation is endchar. A list of those objects read
is returned."
(declare (ignore recursive-p))
@@ -893,7 +893,7 @@
(cond ((eq listtail thelist)
(if *read-suppress*
(return-from read-list nil)
- (%reader-error stream "Nothing appears before . in list.")))
+ (%reader-error stream _"Nothing appears before . in list.")))
((whitespacep nextchar)
(setq nextchar (flush-whitespace stream))))
(rplacd listtail
@@ -914,7 +914,7 @@
(let ((lastobj ()))
(do ((char firstchar (flush-whitespace stream)))
((char= char #\) )
- (%reader-error stream "Nothing appears after . in list."))
+ (%reader-error stream _"Nothing appears after . in list."))
;;see if there's something there.
(setq lastobj (read-maybe-nothing stream char))
(when lastobj (return t)))
@@ -925,7 +925,7 @@
((char= lastchar #\) ) lastobj) ;success!
;;try reading virtual whitespace
(if (read-maybe-nothing stream lastchar)
- (%reader-error stream "More than one object follows . in list.")))))
+ (%reader-error stream _"More than one object follows . in list.")))))
(defun read-string (stream closech)
;;this accumulates chars until it sees same char that invoked it.
@@ -961,12 +961,12 @@
(defun read-right-paren (stream ignore)
(declare (ignore ignore))
(cond (*ignore-extra-close-parentheses*
- (warn "Ignoring unmatched close parenthesis~
+ (warn _"Ignoring unmatched close parenthesis~
~@[ at file position ~D~]."
(file-position stream))
(values))
(t
- (%reader-error stream "Unmatched close parenthesis."))))
+ (%reader-error stream _"Unmatched close parenthesis."))))
;;; INTERNAL-READ-EXTENDED-TOKEN -- Internal
;;;
@@ -997,7 +997,7 @@
(push *ouch-ptr* escapes)
(let ((nextchar (read-char stream nil eof-object)))
(if (eofp nextchar)
- (reader-eof-error stream "after escape character")
+ (reader-eof-error stream _"after escape character")
(ouch-read-buffer nextchar))))
((multiple-escape-p char)
;; Read to next multiple-escape, escaping single chars along the
@@ -1006,12 +1006,12 @@
(let ((ch (read-char stream nil eof-object)))
(cond
((eofp ch)
- (reader-eof-error stream "inside extended token"))
+ (reader-eof-error stream _"inside extended token"))
((multiple-escape-p ch) (return))
((escapep ch)
(let ((nextchar (read-char stream nil eof-object)))
(cond ((eofp nextchar)
- (reader-eof-error stream "after escape character"))
+ (reader-eof-error stream _"after escape character"))
(t
(push *ouch-ptr* escapes)
(ouch-read-buffer nextchar)))))
@@ -1042,7 +1042,7 @@
(t
(setf att (get-secondary-attribute ,char))
(cond ((= att #.constituent-invalid)
- (%reader-error stream "invalid constituent"))
+ (%reader-error stream _"invalid constituent"))
(t
att))))))
@@ -1064,7 +1064,7 @@
((= att constituent-digit)
constituent)
((= att constituent-invalid)
- (%reader-error stream "invalid constituent"))
+ (%reader-error stream _"invalid constituent"))
(t
att))))))
@@ -1096,7 +1096,7 @@
constituent-digit)
constituent-decimal-digit))
((= att constituent-invalid)
- (%reader-error stream "invalid constituent"))
+ (%reader-error stream _"invalid constituent"))
(t
att))))))
@@ -1105,10 +1105,10 @@
;;;; Token fetching.
(defvar *read-suppress* nil
- "Suppresses most interpreting of the reader when T")
+ _N"Suppresses most interpreting of the reader when T")
(defvar *read-base* 10
- "The radix that Lisp reads numbers in.")
+ _N"The radix that Lisp reads numbers in.")
(declaim (type (integer 2 36) *read-base*))
;;; CASIFY-READ-BUFFER -- Internal
@@ -1158,7 +1158,7 @@
(all-upper (lower-em))))))))))))
(defun read-token (stream firstchar)
- "This function is just an fsm that recognizes numbers and symbols."
+ _N"This function is just an fsm that recognizes numbers and symbols."
;; Check explicitly whether FIRSTCHAR has an entry for
;; NON-TERMINATING in CHARACTER-ATTRIBUTE-TABLE and
;; READ-DOT-NUMBER-SYMBOL in CMT. Report an error if these are
@@ -1190,7 +1190,7 @@
(#.escape (go ESCAPE))
(#.package-delimiter (go COLON))
(#.multiple-escape (go MULT-ESCAPE))
- (#.constituent-invalid (%reader-error stream "invalid constituent"))
+ (#.constituent-invalid (%reader-error stream _"invalid constituent"))
;; can't have eof, whitespace, or terminating macro as first char!
(t (go SYMBOL)))
SIGN ; saw "sign"
@@ -1247,7 +1247,7 @@
(unless char (return (make-integer)))
(case (char-class3 char *readtable*)
(#.constituent-digit (go LEFTDIGIT))
- (#.constituent-decimal-digit (error "impossible!"))
+ (#.constituent-decimal-digit (error _"impossible!"))
(#.constituent-dot (go SYMBOL))
(#.constituent-digit-or-expt (go LEFTDIGIT))
(#.constituent-expt (go SYMBOL))
@@ -1321,11 +1321,11 @@
FRONTDOT ; saw "dot"
(ouch-read-buffer char)
(setq char (read-char stream nil nil))
- (unless char (%reader-error stream "dot context error"))
+ (unless char (%reader-error stream _"dot context error"))
(case (char-class char *readtable*)
(#.constituent-digit (go RIGHTDIGIT))
(#.constituent-dot (go DOTS))
- (#.delimiter (%reader-error stream "dot context error"))
+ (#.delimiter (%reader-error stream _"dot context error"))
(#.escape (go ESCAPE))
(#.multiple-escape (go MULT-ESCAPE))
(#.package-delimiter (go COLON))
@@ -1394,12 +1394,12 @@
DOTS ; saw "dot {dot}+"
(ouch-read-buffer char)
(setq char (read-char stream nil nil))
- (unless char (%reader-error stream "too many dots"))
+ (unless char (%reader-error stream _"too many dots"))
(case (char-class char *readtable*)
(#.constituent-dot (go DOTS))
(#.delimiter
(unread-char char stream)
- (%reader-error stream "too many dots"))
+ (%reader-error stream _"too many dots"))
(#.escape (go ESCAPE))
(#.multiple-escape (go MULT-ESCAPE))
(#.package-delimiter (go COLON))
@@ -1456,7 +1456,7 @@
;; READ-NEXT CHAR, put in buffer (no case conversion).
(let ((nextchar (read-char stream nil nil)))
(unless nextchar
- (reader-eof-error stream "after escape character"))
+ (reader-eof-error stream _"after escape character"))
(push *ouch-ptr* escapes)
(ouch-read-buffer nextchar))
(setq char (read-char stream nil nil))
@@ -1485,7 +1485,7 @@
COLON
(casify-read-buffer escapes)
(unless (zerop colons)
- (%reader-error stream "too many colons in ~S"
+ (%reader-error stream _"too many colons in ~S"
(read-buffer-to-string)))
(setq colons 1)
(setq package-designator
@@ -1502,7 +1502,7 @@
(reset-read-buffer)
(setq escapes ())
(setq char (read-char stream nil nil))
- (unless char (reader-eof-error stream "after reading a colon"))
+ (unless char (reader-eof-error stream _"after reading a colon"))
(case (char-class char *readtable*)
(#.delimiter
(unread-char char stream)
@@ -1517,7 +1517,7 @@
(setq colons 2)
(setq char (read-char stream nil nil))
(unless char
- (reader-eof-error stream "after reading a colon"))
+ (reader-eof-error stream _"after reading a colon"))
(case (char-class char *readtable*)
(#.delimiter
(unread-char char stream)
@@ -1539,7 +1539,7 @@
(unless found
(error 'reader-package-error :stream stream
:format-arguments (list package-designator)
- :format-control "package ~S not found"))
+ :format-control _"package ~S not found"))
(if (or (zerop colons) (= colons 2) (eq found *keyword-package*))
(return (intern* *read-buffer* *ouch-ptr* found))
@@ -1547,18 +1547,18 @@
(find-symbol* *read-buffer* *ouch-ptr* found)
(when (eq test :external) (return symbol))
(let ((name (read-buffer-to-string)))
- (with-simple-restart (continue "Use symbol anyway.")
+ (with-simple-restart (continue _"Use symbol anyway.")
(error 'reader-package-error :stream stream
:format-arguments (list name (package-name found))
:format-control
(if test
- "The symbol ~S is not external in the ~A package."
- "Symbol ~S not found in the ~A package.")))
+ _"The symbol ~S is not external in the ~A package."
+ _"Symbol ~S not found in the ~A package.")))
(return (intern name found)))))))))
(defun read-extended-token (stream &optional (*readtable* *readtable*))
- "For semi-external use: returns 3 values: the string for the token,
+ _N"For semi-external use: returns 3 values: the string for the token,
a flag for whether there was an escape char, and the position of any
package delimiter."
(let ((firstch (read-char stream nil nil t)))
@@ -1571,7 +1571,7 @@
(values "" nil nil)))))
(defun read-extended-token-escaped (stream &optional (*readtable* *readtable*))
- "For semi-external use: read an extended token with the first character
+ _N"For semi-external use: read an extended token with the first character
escaped. Returns the string for the token."
(let ((firstch (read-char stream nil nil)))
(cond (firstch
@@ -1579,7 +1579,7 @@
(casify-read-buffer escapes)
(read-buffer-to-string)))
(t
- (reader-eof-error stream "after escape")))))
+ (reader-eof-error stream _"after escape")))))
@@ -1594,7 +1594,7 @@
(defvar *integer-reader-safe-digits*
'#(NIL NIL
26 17 13 11 10 9 8 8 8 7 7 7 7 6 6 6 6 6 6 6 6 5 5 5 5 5 5 5 5 5 5 5 5 5 5)
- "Holds the mapping of base to 'safe' number of digits to read for a fixnum.")
+ _N"Holds the mapping of base to 'safe' number of digits to read for a fixnum.")
(defvar *integer-reader-base-power*
'#(NIL NIL
@@ -1603,7 +1603,7 @@
16777216 24137569 34012224 47045881 64000000 85766121 113379904 6436343
7962624 9765625 11881376 14348907 17210368 20511149 24300000 28629151
33554432 39135393 45435424 52521875 60466176)
- "Holds the largest fixnum power of the base for make-integer.")
+ _N"Holds the largest fixnum power of the base for make-integer.")
(declaim (simple-vector *integer-reader-safe-digits*
*integer-reader-base-power*))
@@ -1624,7 +1624,7 @@
|#
(defun make-integer ()
- "Minimizes bignum-fixnum multiplies by reading a 'safe' number of digits,
+ _N"Minimizes bignum-fixnum multiplies by reading a 'safe' number of digits,
then multiplying by a power of the base and adding."
(read-unwind-read-buffer)
;; Use the fast reader if the number has enough digits. It seems
@@ -1661,7 +1661,7 @@
(setq number (+ num (* number base-power))))))))
(defun fast-read-integer (r)
- "Fast bignum-reading interface. Reads from stream S an integer in radix
+ _N"Fast bignum-reading interface. Reads from stream S an integer in radix
R. If we find some kind of error (bad characters, EOF), then NIL is
returned; otherwise the number. Reads at least one digit, but may not get to
the end of the stream."
@@ -1789,7 +1789,7 @@
(return-from make-float (if negative-fraction
(- num)
num))))
- (t (error "Internal error in floating point reader.")))))
+ (t (error _"Internal error in floating point reader.")))))
(defun make-float-aux (number divisor float-format stream)
(handler-case
@@ -1801,10 +1801,10 @@
;; But we really want to indicate that we can't read it.
;; So if we converted the number to zero, but the number
;; wasn't actually zero, throw an error.
- (error "Underflow"))
+ (error _"Underflow"))
result))
(error ()
- (%reader-error stream "Floating-point number not representable"))))
+ (%reader-error stream _"Floating-point number not representable"))))
(defun make-ratio (stream)
@@ -1831,7 +1831,7 @@
((or (eofp ch) (not (setq dig (digit-char-p ch *read-base*)))))
(setq denominator (+ (* denominator *read-base*) dig)))
(when (zerop denominator)
- (%reader-error stream "Invalid ratio: ~S/~S"
+ (%reader-error stream _"Invalid ratio: ~S/~S"
(if negative-number (- numerator) numerator)
denominator))
(let ((num (/ numerator denominator)))
@@ -1845,12 +1845,12 @@
(declare (ignore ignore))
(if *read-suppress*
(values)
- (%reader-error stream "No dispatch function defined for ~S." sub-char)))
+ (%reader-error stream _"No dispatch function defined for ~S." sub-char)))
(defun make-dispatch-macro-character (char &optional
(non-terminating-p nil)
(rt *readtable*))
- "Causes char to become a dispatching macro character in readtable
+ _N"Causes char to become a dispatching macro character in readtable
(which defaults to the current readtable). If the non-terminating-p
flag is set to T, the char will be non-terminating. Make-dispatch-
macro-character returns T."
@@ -1862,23 +1862,23 @@
(defun set-dispatch-macro-character
(disp-char sub-char function &optional (rt *readtable*))
- "Causes function to be called whenever the reader reads
+ _N"Causes function to be called whenever the reader reads
disp-char followed by sub-char. Set-dispatch-macro-character
returns T."
;;get the dispatch char for macro (error if not there), diddle
;;entry for sub-char.
(when (digit-char-p sub-char)
- (simple-program-error "Dispatch Sub-Char must not be a decimal digit: ~S" sub-char))
+ (simple-program-error _"Dispatch Sub-Char must not be a decimal digit: ~S" sub-char))
(let* ((sub-char (char-upcase sub-char))
(dpair (find disp-char (dispatch-tables rt)
:test #'char= :key #'car)))
(if dpair
(set-dispatch-char sub-char function (cdr dpair))
- (simple-program-error "~S is not a dispatch character." disp-char))))
+ (simple-program-error _"~S is not a dispatch character." disp-char))))
(defun get-dispatch-macro-character
(disp-char sub-char &optional (rt *readtable*))
- "Returns the macro character function for sub-char under disp-char
+ _N"Returns the macro character function for sub-char under disp-char
or nil if there is no associated function."
(unless (digit-char-p sub-char)
(let* ((sub-char (char-upcase sub-char))
@@ -1887,7 +1887,7 @@
:test #'char= :key #'car)))
(if dpair
(get-dispatch-char sub-char (cdr dpair))
- (simple-program-error "~S is not a dispatch character." disp-char)))))
+ (simple-program-error _"~S is not a dispatch character." disp-char)))))
(defun read-dispatch-char (stream char)
;;read some digits
@@ -1901,7 +1901,7 @@
(not (setq dig (digit-char-p ch))))
;;take care of the extra char.
(if (eofp ch)
- (reader-eof-error stream "inside dispatch character")
+ (reader-eof-error stream _"inside dispatch character")
(setq sub-char (char-upcase ch))))
(setq numargp t)
(setq numarg (+ (* numarg 10) dig)))
@@ -1911,19 +1911,19 @@
(if dpair
(funcall (the function (get-dispatch-char sub-char (cdr dpair)))
stream sub-char (if numargp numarg nil))
- (%reader-error stream "No dispatch table for dispatch char.")))))
+ (%reader-error stream _"No dispatch table for dispatch char.")))))
;;;; READ-FROM-STRING.
(defvar read-from-string-spares ()
- "A resource of string streams for Read-From-String.")
+ _N"A resource of string streams for Read-From-String.")
(defun read-from-string (string &optional (eof-error-p t) eof-value
&key (start 0) end
preserve-whitespace)
- "The characters of string are successively given to the lisp reader
+ _N"The characters of string are successively given to the lisp reader
and the lisp object built by the reader is returned. Macro chars
will take effect."
(declare (string string))
@@ -1948,7 +1948,7 @@
;;;; PARSE-INTEGER.
(defun parse-integer (string &key (start 0) end (radix 10) junk-allowed)
- "Examine the substring of string delimited by start and end
+ _N"Examine the substring of string delimited by start and end
(default to the beginning and end of the string) It skips over
whitespace characters and then tries to parse an integer. The
radix parameter must be between 2 and 36."
@@ -1988,11 +1988,11 @@
(if junk-allowed
(values nil real-index)
(error 'simple-parse-error
- :format-control "There are no digits in this string: ~S"
+ :format-control _"There are no digits in this string: ~S"
:format-arguments (list string))))
((and (< index end) (not junk-allowed))
(error 'simple-parse-error
- :format-control "There's junk in this string: ~S."
+ :format-control _"There's junk in this string: ~S."
:format-arguments (list string)))
(t
(values (* sign result) real-index)))))))))
Index: src/code/remote.lisp
diff -u src/code/remote.lisp:1.9.48.1 src/code/remote.lisp:1.9.48.2
--- src/code/remote.lisp:1.9.48.1 Mon Feb 8 12:15:49 2010
+++ src/code/remote.lisp Tue Feb 9 21:04:05 2010
@@ -5,7 +5,7 @@
;;; Carnegie Mellon University, and has been placed in the public domain.
;;;
(ext:file-comment
- "$Header: /project/cmucl/cvsroot/src/code/remote.lisp,v 1.9.48.1 2010-02-08 17:15:49 rtoy Exp $")
+ "$Header: /project/cmucl/cvsroot/src/code/remote.lisp,v 1.9.48.2 2010-02-10 02:04:05 rtoy Exp $")
;;;
;;; **********************************************************************
;;;
@@ -28,7 +28,7 @@
finished)
(defvar *pending-returns* nil
- "AList of wire . remote-wait structs")
+ _N"AList of wire . remote-wait structs")
;;; MAYBE-NUKE-REMOTE-WAIT -- internal
@@ -52,7 +52,7 @@
;;; environment of the macro call. No values are returned.
;;;
(defmacro remote (wire-form &body forms)
- "Evaluates the given forms remotly. No values are returned, as the remote
+ _N"Evaluates the given forms remotly. No values are returned, as the remote
evaluation is asyncronus."
(let ((wire (gensym)))
`(let ((,wire ,wire-form))
@@ -72,7 +72,7 @@
;;; return, cause we can kind of guess at what the currect results would be.
;;;
(defmacro remote-value-bind (wire-form vars form &rest body)
- "Bind VARS to the multiple values of FORM (which is executed remotely). The
+ _N"Bind VARS to the multiple values of FORM (which is executed remotely). The
forms in BODY are only executed if the remote function returned (as apposed
to aborting due to a throw)."
(cond
@@ -142,8 +142,8 @@
;;;
(defmacro remote-value (wire-form form &optional
(on-server-unwind
- `(error "Remote server unwound")))
- "Execute the single form remotly. The value of the form is returned.
+ `(error _"Remote server unwound")))
+ _N"Execute the single form remotly. The value of the form is returned.
The optional form on-server-unwind is only evaluated if the server unwinds
instead of returning."
(let ((remote (gensym))
@@ -323,7 +323,7 @@
;;; it, call NEW-CONNECTION to do the connecting.
;;;
(defun create-request-server (port &optional on-connect &key reuse-address)
- "Create a request server on the given port. Whenever anyone connects to it,
+ _N"Create a request server on the given port. Whenever anyone connects to it,
call the given function with the newly created wire and the address of the
connector. If the function returns NIL, the connection is destroyed;
otherwise, it is accepted. This returns a manifestation of the server that
@@ -345,7 +345,7 @@
;;; closes the socket behind it.
;;;
(defun destroy-request-server (server)
- "Quit accepting connections to the given request server."
+ _N"Quit accepting connections to the given request server."
(system:remove-fd-handler (request-server-handler server))
(ext:close-socket (request-server-socket server))
nil)
@@ -356,7 +356,7 @@
;;; installed to handle return values, etc.
;;;
(defun connect-to-remote-server (hostname port &optional on-death)
- "Connect to a remote request server addressed with the given host and port
+ _N"Connect to a remote request server addressed with the given host and port
pair. This returns the created wire."
(let* ((socket (ext:connect-to-inet-socket hostname port))
(wire (make-wire socket)))
Index: src/i18n/locale/ko/LC_MESSAGES/cmucl.mo
<<Binary file>>
More information about the cmucl-commit
mailing list