diff options
Diffstat (limited to 'src/lread.c')
| -rw-r--r-- | src/lread.c | 43 |
1 files changed, 16 insertions, 27 deletions
diff --git a/src/lread.c b/src/lread.c index 8777bc34545..d32f0b6a7e2 100644 --- a/src/lread.c +++ b/src/lread.c | |||
| @@ -61,20 +61,21 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 61 | #endif | 61 | #endif |
| 62 | 62 | ||
| 63 | /* hash table read constants */ | 63 | /* hash table read constants */ |
| 64 | Lisp_Object Qhash_table, Qdata; | 64 | static Lisp_Object Qhash_table, Qdata; |
| 65 | Lisp_Object Qtest, Qsize; | 65 | static Lisp_Object Qtest, Qsize; |
| 66 | Lisp_Object Qweakness; | 66 | static Lisp_Object Qweakness; |
| 67 | Lisp_Object Qrehash_size; | 67 | static Lisp_Object Qrehash_size; |
| 68 | Lisp_Object Qrehash_threshold; | 68 | static Lisp_Object Qrehash_threshold; |
| 69 | 69 | ||
| 70 | Lisp_Object Qread_char, Qget_file_char, Qstandard_input, Qcurrent_load_list; | 70 | static Lisp_Object Qread_char, Qget_file_char, Qcurrent_load_list; |
| 71 | Lisp_Object Qstandard_input; | ||
| 71 | Lisp_Object Qvariable_documentation; | 72 | Lisp_Object Qvariable_documentation; |
| 72 | Lisp_Object Qascii_character, Qload, Qload_file_name; | 73 | static Lisp_Object Qascii_character, Qload, Qload_file_name; |
| 73 | Lisp_Object Qbackquote, Qcomma, Qcomma_at, Qcomma_dot, Qfunction; | 74 | Lisp_Object Qbackquote, Qcomma, Qcomma_at, Qcomma_dot, Qfunction; |
| 74 | Lisp_Object Qinhibit_file_name_operation; | 75 | static Lisp_Object Qinhibit_file_name_operation; |
| 75 | Lisp_Object Qeval_buffer_list; | 76 | static Lisp_Object Qeval_buffer_list; |
| 76 | Lisp_Object Qlexical_binding; | 77 | static Lisp_Object Qlexical_binding; |
| 77 | Lisp_Object Qfile_truename, Qdo_after_load_evaluation; /* ACM 2006/5/16 */ | 78 | static Lisp_Object Qfile_truename, Qdo_after_load_evaluation; /* ACM 2006/5/16 */ |
| 78 | 79 | ||
| 79 | /* Used instead of Qget_file_char while loading *.elc files compiled | 80 | /* Used instead of Qget_file_char while loading *.elc files compiled |
| 80 | by Emacs 21 or older. */ | 81 | by Emacs 21 or older. */ |
| @@ -90,7 +91,7 @@ static Lisp_Object Qload_in_progress; | |||
| 90 | Each member of the list has the form (n . object), and is used to | 91 | Each member of the list has the form (n . object), and is used to |
| 91 | look up the object for the corresponding #n# construct. | 92 | look up the object for the corresponding #n# construct. |
| 92 | It must be set to nil before all top-level calls to read0. */ | 93 | It must be set to nil before all top-level calls to read0. */ |
| 93 | Lisp_Object read_objects; | 94 | static Lisp_Object read_objects; |
| 94 | 95 | ||
| 95 | /* Nonzero means READCHAR should read bytes one by one (not character) | 96 | /* Nonzero means READCHAR should read bytes one by one (not character) |
| 96 | when READCHARFUN is Qget_file_char or Qget_emacs_mule_file_char. | 97 | when READCHARFUN is Qget_file_char or Qget_emacs_mule_file_char. |
| @@ -3577,11 +3578,11 @@ read_list (int flag, register Lisp_Object readcharfun) | |||
| 3577 | } | 3578 | } |
| 3578 | } | 3579 | } |
| 3579 | 3580 | ||
| 3580 | Lisp_Object initial_obarray; | 3581 | static Lisp_Object initial_obarray; |
| 3581 | 3582 | ||
| 3582 | /* oblookup stores the bucket number here, for the sake of Funintern. */ | 3583 | /* oblookup stores the bucket number here, for the sake of Funintern. */ |
| 3583 | 3584 | ||
| 3584 | int oblookup_last_bucket_number; | 3585 | static int oblookup_last_bucket_number; |
| 3585 | 3586 | ||
| 3586 | static int hash_string (const char *ptr, int len); | 3587 | static int hash_string (const char *ptr, int len); |
| 3587 | 3588 | ||
| @@ -3641,18 +3642,6 @@ intern_c_string (const char *str) | |||
| 3641 | 3642 | ||
| 3642 | return Fintern (make_pure_c_string (str), obarray); | 3643 | return Fintern (make_pure_c_string (str), obarray); |
| 3643 | } | 3644 | } |
| 3644 | |||
| 3645 | /* Create an uninterned symbol with name STR. */ | ||
| 3646 | |||
| 3647 | Lisp_Object | ||
| 3648 | make_symbol (const char *str) | ||
| 3649 | { | ||
| 3650 | int len = strlen (str); | ||
| 3651 | |||
| 3652 | return Fmake_symbol (!NILP (Vpurify_flag) | ||
| 3653 | ? make_pure_string (str, len, len, 0) | ||
| 3654 | : make_string (str, len)); | ||
| 3655 | } | ||
| 3656 | 3645 | ||
| 3657 | DEFUN ("intern", Fintern, Sintern, 1, 2, 0, | 3646 | DEFUN ("intern", Fintern, Sintern, 1, 2, 0, |
| 3658 | doc: /* Return the canonical symbol whose name is STRING. | 3647 | doc: /* Return the canonical symbol whose name is STRING. |