mirrors/ecl
1
Fork 0
mirror of https://gitlab.com/embeddable-common-lisp/ecl.git synced 2026-04-27 11:40:45 -07:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop' into refactor-run-program

Browse source
This commit is contained in:
Daniel Kochmański 2017-03-13 21:24:28 +01:00
commit 71f71a5924
6 changed files with 38040 additions and 38032 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/c/dpp.c
View file

@ -668,7 +668,15 @@ put_declaration(void)
put_lineno();
the_env_defined = 1;
fprintf(out, "\tconst cl_env_ptr the_env = ecl_process_env();\n");
fprintf(out,
"#ifdef __clang__\n"
"#pragma clang diagnostic push\n"
"#pragma clang diagnostic ignored \"-Wunused-variable\"\n"
"#endif\n"
"\tconst cl_env_ptr the_env = ecl_process_env();\n"
"#ifdef __clang__\n"
"#pragma clang diagnostic pop\n"
"#endif\n" );
for (i = 0; i < nopt; i++) {
put_lineno();
fprintf(out, "\tcl_object %s;\n", optional[i].o_var);

12
src/c/file.d
View file

@ -1099,10 +1099,8 @@ utf_8_decoder(cl_object stream)
static int
utf_8_encoder(cl_object stream, unsigned char *buffer, ecl_character c)
{
int nbytes;
if (c < 0) {
nbytes = 0;
} else if (c <= 0x7F) {
int nbytes = 0;
if (c <= 0x7F) {
buffer[0] = c;
nbytes = 1;
} else if (c <= 0x7ff) {
@ -1626,7 +1624,7 @@ ecl_make_string_input_stream(cl_object strng, cl_index istart, cl_index iend)
strm->stream.flags = ECL_STREAM_DEFAULT_FORMAT;
strm->stream.byte_size = 8;
#else
if (ECL_BASE_STRING_P(strng) == t_base_string) {
if (ECL_BASE_STRING_P(strng)) {
strm->stream.format = @':latin-1';
strm->stream.flags = ECL_STREAM_LATIN_1;
strm->stream.byte_size = 8;
@ -2784,10 +2782,12 @@ io_file_get_position(cl_object strm)
offset = lseek(f, 0, SEEK_CUR);
ecl_enable_interrupts();
unlikely_if (offset < 0)
{
if (errno == ESPIPE)
return(ECL_NIL);
else
io_error(strm);
}
if (sizeof(ecl_off_t) == sizeof(long)) {
output = ecl_make_integer(offset);
} else {
@ -5126,7 +5126,7 @@ ecl_open_stream(cl_object fn, enum ecl_smmode smm, cl_object if_exists,
FEerror("Illegal stream mode ~S", 1, ecl_make_fixnum(smm));
}
if (flags & ECL_STREAM_C_STREAM) {
FILE *fp;
FILE *fp = 0;
safe_close(f);
/* We do not use fdopen() because Windows seems to
* have problems with the resulting streams. Furthermore, even for

75986
src/c/unicode/ucd_names_pair.c
View file

File diff suppressed because it is too large Load diff

2
src/lsp/process.lsp
View file

@ -113,7 +113,7 @@
option "/c")))
(nth-value 1 (run-program shell (list option cmd-string)
:wait t :output nil :input nil :error nil
#+windows :escape-arguments nil))))
#+windows :escape-arguments #+windows nil))))
;;;
;;; Almighty EXT:RUN-PROGRAM. Built on top of SI:SPAWN-SUBPROCESS. For

6
src/lsp/top.lsp
View file

@ -140,10 +140,10 @@
((? :h :help) tpl-help-command nil
":h(elp) or ? Help. Type \":help help\" for more information"
":help &optional topic [Top level command]~@
:h &optional topic [Abbrevation]~@
:h &optional topic [Abbreviation]~@
~@
Print information on specified topic. With no arguments, print~@
quick summery of top level commands.~@
quick summary of top level commands.~@
~@
Help information for top level commands follows the documentation~@
style found in \"Common Lisp, the Language\"; and, in general, the~@
@ -370,7 +370,7 @@
((:hs :help-stack) tpl-help-stack-command nil
":hs Help stack"
":help-stack [Break command]~@
:hs [Abbrevation]~@
:hs [Abbreviation]~@
~@
Lists the functions to access the LISP system stacks.~%")
((:i :inspect) tpl-inspect-command nil

56
src/lsp/trace.lsp
View file

@ -237,38 +237,38 @@ all functions."
(defconstant step-commands
`("Stepper commands"
((:newline) (step-next) :constant
"newline Advance to the next form"
"newline [Stepper command]~@
~@
Step to next form.~%")
"newline Advance to the next form"
"newline [Stepper command]~@
~@
Step to next form.~%")
((:s :skip) step-skip nil
":s(kip) Skip current form or until function"
":skip &optional arg [Stepper command]~@
:s &optional arg [Abbreviation]~@
~@
Continue evaluation without stepping. Without argument, resume
stepping after the current form. With numeric argument (n),
resume stepping at the n-th level above. With function name, resume
when given function is called.~%")
":s(kip) Skip current form or until function"
":skip &optional arg [Stepper command]~@
:s &optional arg [Abbreviation]~@
~@
Continue evaluation without stepping. Without argument, resume~@
stepping after the current form. With numeric argument (n),~@
resume stepping at the n-th level above. With function name, resume~@
when given function is called.~%")
((:pr :print) (step-print) :constant
":pr(int) Pretty print current form"
":print [Stepper command]~@
:p [Abbreviation]~@
~@
Pretty print current form.~%")
":pr(int) Pretty print current form"
":print [Stepper command]~@
:pr [Abbreviation]~@
~@
Pretty print current form.~%")
((:form) *step-form* :constant
":form Current form"
":form [Stepper command]~@
~@
Return the current form. Nothing is done, but the current form~@
is returned as the value of this command. As a consequence,~@
it is printed by the top level in the usual way and saved in~@
the variable *. The main purpose of this command is to allow~@
the current form to be examined further by accessing *.~%")
":form Current form"
":form [Stepper command]~@
~@
Return the current form. Nothing is done, but the current form~@
is returned as the value of this command. As a consequence,~@
it is printed by the top level in the usual way and saved in~@
the variable *. The main purpose of this command is to allow~@
the current form to be examined further by accessing *.~%")
((:x :exit) (step-quit) :constant
":x or :exit Finish evaluation and exit stepper"
":exit [Stepper command]~@
:x [Abbreviation]~@
":x or :exit Finish evaluation and exit stepper"
":exit [Stepper command]~@
:x [Abbreviation]~@
~@
Finish evaluation without stepping.~%")
))