Mercurial > hg > xemacs-beta
view lib-src/winclient.c @ 4885:6772ce4d982b
Fix hash tables, #'member*, #'assoc*, #'eql compiler macros if bignums
lisp/ChangeLog addition:
2010-01-24 Aidan Kehoe <kehoea@parhasard.net>
Correct the semantics of #'member*, #'eql, #'assoc* in the
presence of bignums; change the integerp byte code to fixnump
semantics.
* bytecomp.el (fixnump, integerp, byte-compile-integerp):
Change the integerp byte code to fixnump; add a byte-compile
method to integerp using fixnump and numberp and avoiding a
funcall most of the time, since in the non-core contexts where
integerp is used, it's mostly distinguishing between fixnums and
things that are not numbers at all.
* byte-optimize.el (side-effect-free-fns, byte-after-unbind-ops)
(byte-compile-side-effect-and-error-free-ops):
Replace the integerp bytecode with fixnump; add fixnump to the
side-effect-free-fns. Add the other extended number type
predicates to the list in passing.
* obsolete.el (floatp-safe): Mark this as obsolete.
* cl.el (eql): Go into more detail in the docstring here. Don't
bother checking whether both arguments are numbers; one is enough,
#'equal will fail correctly if they have distinct types.
(subst): Replace a call to #'integerp (deciding whether to use
#'memq or not) with one to #'fixnump.
Delete most-positive-fixnum, most-negative-fixnum from this file;
they're now always in C, so they can't be modified from Lisp.
* cl-seq.el (member*, assoc*, rassoc*):
Correct these functions in the presence of bignums.
* cl-macs.el (cl-make-type-test): The type test for a fixnum is
now fixnump. Ditch floatp-safe, use floatp instead.
(eql): Correct this compiler macro in the presence of bignums.
(assoc*): Correct this compiler macro in the presence of bignums.
* simple.el (undo):
Change #'integerp to #'fixnump here, since we use #'delq with the
same value as ELT a few lines down.
src/ChangeLog addition:
2010-01-24 Aidan Kehoe <kehoea@parhasard.net>
Fix problems with #'eql, extended number types, and the hash table
implementation; change the Bintegerp bytecode to fixnump semantics
even on bignum builds, since #'integerp can have a fast
implementation in terms of #'fixnump for most of its extant uses,
but not vice-versa.
* lisp.h: Always #include number.h; we want the macros provided in
it, even if the various number types are not available.
* number.h (NON_FIXNUM_NUMBER_P): New macro, giving 1 when its
argument is of non-immediate number type. Equivalent to FLOATP if
WITH_NUMBER_TYPES is not defined.
* elhash.c (lisp_object_eql_equal, lisp_object_eql_hash):
Use NON_FIXNUM_NUMBER_P in these functions, instead of FLOATP,
giving more correct behaviour in the presence of the extended
number types.
* bytecode.c (Bfixnump, execute_optimized_program):
Rename Bintegerp to Bfixnump; change its semantics to reflect the
new name on builds with bignum support.
* data.c (Ffixnump, Fintegerp, syms_of_data, vars_of_data):
Always make #'fixnump available, even on non-BIGNUM builds;
always implement #'integerp in this file, even on BIGNUM builds.
Move most-positive-fixnum, most-negative-fixnum here from
number.c, so they are Lisp constants even on builds without number
types, and attempts to change or bind them error.
Use the NUMBERP and INTEGERP macros even on builds without
extended number types.
* data.c (fixnum_char_or_marker_to_int):
Rename this function from integer_char_or_marker_to_int, to better
reflect the arguments it accepts.
* number.c (Fevenp, Foddp, syms_of_number):
Never provide #'integerp in this file. Remove #'oddp,
#'evenp; their implementations are overridden by those in cl.el.
* number.c (vars_of_number):
most-positive-fixnum, most-negative-fixnum are no longer here.
man/ChangeLog addition:
2010-01-23 Aidan Kehoe <kehoea@parhasard.net>
Generally: be careful to say fixnum, not integer, when talking
about fixed-precision integral types. I'm sure I've missed
instances, both here and in the docstrings, but this is a decent
start.
* lispref/text.texi (Columns):
Document where only fixnums, not integers generally, are accepted.
(Registers):
Remove some ancient char-int confoundance here.
* lispref/strings.texi (Creating Strings, Creating Strings):
Be more exact in describing where fixnums but not integers in
general are accepted.
(Creating Strings): Use a more contemporary example to illustrate
how concat deals with lists including integers about #xFF. Delete
some obsolete documentation on same.
(Char Table Types): Document that only fixnums are accepted as
values in syntax tables.
* lispref/searching.texi (String Search, Search and Replace):
Be exact in describing where fixnums but not integers in general
are accepted.
* lispref/range-tables.texi (Range Tables): Be exact in describing
them; only fixnums are accepted to describe ranges.
* lispref/os.texi (Killing XEmacs, User Identification)
(Time of Day, Time Conversion):
Be more exact about using fixnum where only fixed-precision
integers are accepted.
* lispref/objects.texi (Integer Type): Be more exact (and
up-to-date) about the possible values for
integers. Cross-reference to documentation of the bignum extension.
(Equality Predicates):
(Range Table Type):
(Array Type): Use fixnum, not integer, to describe a
fixed-precision integer.
(Syntax Table Type): Correct some English syntax here.
* lispref/numbers.texi (Numbers): Change the phrasing here to use
fixnum to mean the fixed-precision integers normal in emacs.
Document that our terminology deviates from that of Common Lisp,
and that we're working on it.
(Compatibility Issues): Reiterate the Common Lisp versus Emacs
Lisp compatibility issues.
(Comparison of Numbers, Arithmetic Operations):
* lispref/commands.texi (Command Loop Info, Working With Events):
* lispref/buffers.texi (Modification Time):
Be more exact in describing where fixnums but not integers in
general are accepted.
author | Aidan Kehoe <kehoea@parhasard.net> |
---|---|
date | Sun, 24 Jan 2010 15:21:27 +0000 |
parents | 61aff09a7589 |
children | 422b4b4fb2a6 |
line wrap: on
line source
/* DDE client for XEmacs. Copyright (C) 2002 Alastair J. Houghton This file is part of XEmacs. XEmacs is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. XEmacs is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with XEmacs; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /* Synched up with: Not in FSF. */ /* -- Includes -------------------------------------------------------------- */ #ifdef HAVE_CONFIG_H # include <config.h> #endif #include <windows.h> #include <ddeml.h> #include <stdlib.h> #include <stdio.h> #include <ctype.h> #include <errno.h> static void error (const char* s1, const char* s2); static void fatal (const char *s1, const char *s2); static void * xmalloc (size_t size); static char * getNextArg (const char **ptr, unsigned *len); /* -- Post-Include Defines -------------------------------------------------- */ /* Timeouts & delays */ #define CONNECT_RETRIES 10 #define CONNECT_DELAY 500 /* ms */ #define TRANSACTION_TIMEOUT 5000 /* ms */ #define MAX_INPUT_IDLE_WAIT INFINITE /* ms */ /* DDE Strings */ #define SERVICE_NAME "XEmacs" #define TOPIC_NAME "System" #define COMMAND_FORMAT "[open(\"%s%s\")]" /* XEmacs program name */ #define PROGRAM_TO_RUN "xemacs.exe" /* -- Constants ------------------------------------------------------------- */ /* -- Global Variables ------------------------------------------------------ */ HINSTANCE hInstance; DWORD idInst = 0; /* -- Function Declarations ------------------------------------------------- */ HDDEDATA CALLBACK ddeCallback (UINT uType, UINT uFmt, HCONV hconv, HSZ hsz1, HSZ hsz2, HDDEDATA hdata, DWORD dwData1, DWORD dwData2); int WINAPI WinMain (HINSTANCE hInst, HINSTANCE hPrev, LPSTR lpCmdLine, int nCmdShow); static HCONV openConversation (void); static void closeConversation (HCONV hConv); static int doFile (HCONV hConv, LPSTR lpszFileName1, LPSTR lpszFileName2); static int parseCommandLine (HCONV hConv, LPSTR lpszCommandLine); /* -- Function Definitions -------------------------------------------------- */ /* * Name : ddeCallback * Function: Gets called by DDEML. * */ HDDEDATA CALLBACK ddeCallback (UINT uType, UINT uFmt, HCONV hconv, HSZ hsz1, HSZ hsz2, HDDEDATA hdata, DWORD dwData1, DWORD dwData2) { return (HDDEDATA) NULL; } /* * Name : WinMain * Function: The program's entry point function. * */ int WINAPI WinMain (HINSTANCE hInst, HINSTANCE hPrev, LPSTR lpCmdLine, int nCmdShow) { HCONV hConv; int ret = 0; UINT uiRet; /* Initialise the DDEML library */ uiRet = DdeInitialize (&idInst, (PFNCALLBACK) ddeCallback, APPCMD_CLIENTONLY |CBF_FAIL_ALLSVRXACTIONS, 0); if (uiRet != DMLERR_NO_ERROR) { MessageBox (NULL, "Could not initialise DDE management library.", "winclient", MB_ICONEXCLAMATION | MB_OK); return 1; } /* Open a conversation */ hConv = openConversation (); if (hConv) { /* OK. Next, we need to parse the command line. */ ret = parseCommandLine (hConv, lpCmdLine); /* Close the conversation */ closeConversation (hConv); } DdeUninitialize (idInst); return ret; } /* * Name : openConversation * Function: Start a conversation. * */ static HCONV openConversation (void) { HSZ hszService = NULL, hszTopic = NULL; HCONV hConv = NULL; /* Get the application (service) name */ hszService = DdeCreateStringHandle (idInst, SERVICE_NAME, CP_WINANSI); if (!hszService) { MessageBox (NULL, "Could not create string handle for service.", "winclient", MB_ICONEXCLAMATION | MB_OK); goto error; } /* Get the topic name */ hszTopic = DdeCreateStringHandle (idInst, TOPIC_NAME, CP_WINANSI); if (!hszTopic) { MessageBox (NULL, "Could not create string handle for topic.", "winclient", MB_ICONEXCLAMATION | MB_OK); goto error; } /* Try to connect */ hConv = DdeConnect (idInst, hszService, hszTopic, NULL); if (!hConv) { STARTUPINFO sti; PROCESS_INFORMATION pi; int n; /* Try to start the program */ ZeroMemory (&sti, sizeof (sti)); sti.cb = sizeof (sti); if (!CreateProcess (NULL, PROGRAM_TO_RUN, NULL, NULL, FALSE, 0, NULL, NULL, &sti, &pi)) { MessageBox (NULL, "Could not start process.", "winclient", MB_ICONEXCLAMATION | MB_OK); goto error; } /* Wait for the process to enter an idle state */ WaitForInputIdle (pi.hProcess, MAX_INPUT_IDLE_WAIT); /* Close the handles */ CloseHandle (pi.hThread); CloseHandle (pi.hProcess); /* Try to connect */ for (n = 0; n < CONNECT_RETRIES; n++) { Sleep (CONNECT_DELAY); hConv = DdeConnect (idInst, hszService, hszTopic, NULL); if (hConv) break; } if (!hConv) { /* Still couldn't connect. */ MessageBox (NULL, "Could not connect to DDE server.", "winclient", MB_ICONEXCLAMATION | MB_OK); goto error; } } /* Release the string handles */ DdeFreeStringHandle (idInst, hszService); DdeFreeStringHandle (idInst, hszTopic); return hConv; error: if (hConv) DdeDisconnect (hConv); if (hszService) DdeFreeStringHandle (idInst, hszService); if (hszTopic) DdeFreeStringHandle (idInst, hszTopic); return NULL; } /* * Name : closeConversation * Function: Close a conversation. * */ static void closeConversation (HCONV hConv) { /* Shut down */ DdeDisconnect (hConv); } /* * Name : doFile * Function: Process a file. * */ int doFile (HCONV hConv, LPSTR lpszFileName1, LPSTR lpszFileName2) { char *buf = NULL; unsigned len; /* Calculate the buffer length */ len = strlen (lpszFileName1) + strlen (lpszFileName2) + strlen (COMMAND_FORMAT); /* Allocate a buffer */ buf = (char *) xmalloc (len); if (!buf) { MessageBox (NULL, "Not enough memory.", "winclient", MB_ICONEXCLAMATION | MB_OK); return 1; } /* Build the command */ len = wsprintf (buf, COMMAND_FORMAT, lpszFileName1, lpszFileName2); len++; /* OK. We're connected. Send the message. */ DdeClientTransaction (buf, len, hConv, NULL, 0, XTYP_EXECUTE, TRANSACTION_TIMEOUT, NULL); free (buf); return 0; } /* * Name : getNextArg * Function: Retrieve the next command line argument. * */ static char * getNextArg (const char **ptr, unsigned *len) { int in_quotes = 0, quit = 0, all_in_quotes = 0; const char *p = *ptr, *start; char *buf = NULL; unsigned length = 0; /* Skip whitespace */ while (*p && isspace (*p)) p++; /* If this is the end, return NULL */ if (!*p) return NULL; /* Remember where we are */ start = p; /* Find the next whitespace character outside quotes */ if (*p == '"') all_in_quotes = 1; while (*p && !quit) { switch (*p) { case '"': in_quotes = 1 - in_quotes; p++; break; case '\\': if (!in_quotes) all_in_quotes = 0; p++; if (!*p) break; p++; break; default: if (isspace (*p) && !in_quotes) quit = 1; else if (!in_quotes) all_in_quotes = 0; if (!quit) p++; } } /* Work out the length */ length = p - start; /* Strip quotes if the argument is completely quoted */ if (all_in_quotes) { start++; length -= 2; } /* Copy */ buf = (char *) xmalloc (length + 1); if (!buf) return NULL; strncpy (buf, start, length); buf[length] = '\0'; /* Return the pointer and length */ *ptr = p; *len = length; return buf; } /* * Name : parseCommandLine * Function: Process the command line. This program accepts a list of strings * : (which may contain wildcards) representing filenames. * */ int parseCommandLine (HCONV hConv, LPSTR lpszCommandLine) { char *fullpath, *filepart; char *arg; unsigned len, pathlen; int ret = 0; HANDLE hFindFile = NULL; WIN32_FIND_DATA wfd; /* Retrieve arguments */ while ((arg = getNextArg ((const char**)&lpszCommandLine, &len)) != NULL) { /* First find the canonical path name */ fullpath = filepart = NULL; pathlen = GetFullPathName (arg, 0, fullpath, &filepart); fullpath = (char *) xmalloc (pathlen); if (!fullpath) { MessageBox (NULL, "Not enough memory.", "winclient", MB_ICONEXCLAMATION | MB_OK); ret = 1; free (arg); break; } GetFullPathName (arg, pathlen, fullpath, &filepart); /* Find the first matching file */ hFindFile = FindFirstFile (arg, &wfd); if (hFindFile == INVALID_HANDLE_VALUE) ret = doFile (hConv, fullpath, ""); else { /* Chop off the file part from the full path name */ if (filepart) *filepart = '\0'; /* For each matching file */ do { /* Process it */ ret = doFile (hConv, fullpath, wfd.cFileName); if (ret) break; } while (FindNextFile (hFindFile, &wfd)); FindClose (hFindFile); } /* Release the path name buffers */ free (fullpath); free (arg); if (ret) break; } return ret; } static void fatal (const char *s1, const char *s2) { error (s1, s2); exit (1); } /* Print error message. `s1' is printf control string, `s2' is arg for it. */ static void error (const char* s1, const char* s2) { fprintf (stderr, "winclient: "); fprintf (stderr, s1, s2); fprintf (stderr, "\n"); } /* Like malloc but get fatal error if memory is exhausted. */ static void * xmalloc (size_t size) { void *result = malloc (size); if (result == NULL) fatal ("virtual memory exhausted", (char *) 0); return result; }