mirror of
https://github.com/freebsd/freebsd-src.git
synced 2024-11-27 17:52:43 +00:00
Resolve conflicts, seems like just one of our changes didn't make it back.
This commit is contained in:
Poul-Henning Kamp
parent
0c8cc99e5b
commit
88cf7394be
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=27680
@ -10,3 +10,11 @@ Tcl 7.5 update 1
|
||||
cd tcl7.5
|
||||
rm -rf win mac compat
|
||||
cvs import src/contrib/tcl TCL tcl7_5_p1
|
||||
|
||||
Tcl 8.0 beta 2
|
||||
Imported with the commands:
|
||||
|
||||
tar zxvf tcl8.0b2.tar.gz
|
||||
cd tcl8.0b2
|
||||
rm -rf win mac compat
|
||||
cvs import src/contrib/tcl TCL tcl8_0_b2
|
||||
|
||||
@ -10,3 +10,11 @@ Tcl 7.5 update 1
|
||||
cd tcl7.5
|
||||
rm -rf win mac compat
|
||||
cvs import src/contrib/tcl TCL tcl7_5_p1
|
||||
|
||||
Tcl 8.0 beta 2
|
||||
Imported with the commands:
|
||||
|
||||
tar zxvf tcl8.0b2.tar.gz
|
||||
cd tcl8.0b2
|
||||
rm -rf win mac compat
|
||||
cvs import src/contrib/tcl TCL tcl8_0_b2
|
||||
|
||||
@ -4,8 +4,7 @@
|
||||
'\" See the file "license.terms" for information on usage and redistribution
|
||||
'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
|
||||
'\"
|
||||
'\" SCCS: @(#) FindExec.3 1.3 96/03/25 20:03:17
|
||||
'\" $Id$
|
||||
'\" SCCS: @(#) FindExec.3 1.4 96/10/09 08:29:29
|
||||
'\"
|
||||
.so man.macros
|
||||
.TH Tcl_FindExecutable 3 7.5 Tcl "Tcl Library Procedures"
|
||||
|
||||
@ -5,8 +5,7 @@
|
||||
'\" See the file "license.terms" for information on usage and redistribution
|
||||
'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
|
||||
'\"
|
||||
'\" SCCS: @(#) break.n 1.6 96/03/25 20:10:27
|
||||
'\" $Id$
|
||||
'\" SCCS: @(#) break.n 1.7 96/10/09 08:29:26
|
||||
'\"
|
||||
.so man.macros
|
||||
.TH break n "" Tcl "Tcl Built-In Commands"
|
||||
|
||||
@ -5,8 +5,7 @@
|
||||
'\" See the file "license.terms" for information on usage and redistribution
|
||||
'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
|
||||
'\"
|
||||
'\" SCCS: @(#) continue.n 1.6 96/03/25 20:12:09
|
||||
'\" $Id$
|
||||
'\" SCCS: @(#) continue.n 1.7 96/10/09 08:29:27
|
||||
'\"
|
||||
.so man.macros
|
||||
.TH continue n "" Tcl "Tcl Built-In Commands"
|
||||
|
||||
@ -1,15 +1,14 @@
|
||||
'\"
|
||||
'\" Copyright (c) 1993 The Regents of the University of California.
|
||||
'\" Copyright (c) 1994-1996 Sun Microsystems, Inc.
|
||||
'\" Copyright (c) 1994-1997 Sun Microsystems, Inc.
|
||||
'\"
|
||||
'\" See the file "license.terms" for information on usage and redistribution
|
||||
'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
|
||||
'\"
|
||||
'\" SCCS: @(#) expr.n 1.17 96/03/14 10:54:40
|
||||
'\" $Id$
|
||||
'\" SCCS: @(#) expr.n 1.25 97/04/29 10:11:52
|
||||
'\"
|
||||
.so man.macros
|
||||
.TH expr n 7.4 Tcl "Tcl Built-In Commands"
|
||||
.TH expr n 8.0 Tcl "Tcl Built-In Commands"
|
||||
.BS
|
||||
'\" Note: do not modify the .SH NAME line immediately below!
|
||||
.SH NAME
|
||||
@ -20,10 +19,8 @@ expr \- Evaluate an expression
|
||||
|
||||
.SH DESCRIPTION
|
||||
.PP
|
||||
.VS
|
||||
Concatenates \fIarg\fR's (adding separator spaces between them),
|
||||
evaluates the result as a Tcl expression, and returns the value.
|
||||
.VE
|
||||
The operators permitted in Tcl expressions are a subset of
|
||||
the operators permitted in C expressions, and they have the
|
||||
same meaning and precedence as the corresponding C operators.
|
||||
@ -42,7 +39,7 @@ non-numeric operands and string comparisons.
|
||||
A Tcl expression consists of a combination of operands, operators,
|
||||
and parentheses.
|
||||
White space may be used between the operands and operators and
|
||||
parentheses; it is ignored by the expression processor.
|
||||
parentheses; it is ignored by the expression's instructions.
|
||||
Where possible, operands are interpreted as integer values.
|
||||
Integer values may be specified in decimal (the normal case), in octal (if the
|
||||
first character of the operand is \fB0\fR), or in hexadecimal (if the first
|
||||
@ -51,7 +48,7 @@ If an operand does not have one of the integer formats given
|
||||
above, then it is treated as a floating-point number if that is
|
||||
possible. Floating-point numbers may be specified in any of the
|
||||
ways accepted by an ANSI-compliant C compiler (except that the
|
||||
``f'', ``F'', ``l'', and ``L'' suffixes will not be permitted in
|
||||
\fBf\fR, \fBF\fR, \fBl\fR, and \fBL\fR suffixes will not be permitted in
|
||||
most installations). For example, all of the
|
||||
following are valid floating-point numbers: 2.1, 3., 6e4, 7.91e+16.
|
||||
If no numeric interpretation is possible, then an operand is left
|
||||
@ -78,14 +75,12 @@ As a Tcl command enclosed in brackets.
|
||||
The command will be executed and its result will be used as
|
||||
the operand.
|
||||
.IP [6]
|
||||
.VS
|
||||
As a mathematical function whose arguments have any of the above
|
||||
forms for operands, such as ``\fBsin($x)\fR''. See below for a list of defined
|
||||
forms for operands, such as \fBsin($x)\fR. See below for a list of defined
|
||||
functions.
|
||||
.VE
|
||||
.LP
|
||||
Where substitutions occur above (e.g. inside quoted strings), they
|
||||
are performed by the expression processor.
|
||||
are performed by the expression's instructions.
|
||||
However, an additional layer of substitution may already have
|
||||
been performed by the command parser before the expression
|
||||
processor was called.
|
||||
@ -111,9 +106,7 @@ The valid operators are listed below, grouped in decreasing order
|
||||
of precedence:
|
||||
.TP 20
|
||||
\fB\-\0\0+\0\0~\0\0!\fR
|
||||
.VS
|
||||
Unary minus, unary plus, bit-wise NOT, logical NOT. None of these operands
|
||||
.VE
|
||||
may be applied to string operands, and bit-wise NOT may be
|
||||
applied only to integers.
|
||||
.TP 20
|
||||
@ -121,10 +114,8 @@ applied only to integers.
|
||||
Multiply, divide, remainder. None of these operands may be
|
||||
applied to string operands, and remainder may be applied only
|
||||
to integers.
|
||||
.VS
|
||||
The remainder will always have the same sign as the divisor and
|
||||
an absolute value smaller than the divisor.
|
||||
.VE
|
||||
.TP 20
|
||||
\fB+\0\0\-\fR
|
||||
Add and subtract. Valid for any numeric operands.
|
||||
@ -189,7 +180,6 @@ the Tcl parser will evaluate both \fB[a]\fR and \fB[b]\fR before
|
||||
invoking the \fBexpr\fR command.
|
||||
.SH "MATH FUNCTIONS"
|
||||
.PP
|
||||
.VS
|
||||
Tcl supports the following mathematical functions in expressions:
|
||||
.DS
|
||||
.ta 3c 6c 9c
|
||||
@ -202,7 +192,8 @@ Tcl supports the following mathematical functions in expressions:
|
||||
Each of these functions invokes the math library function of the same
|
||||
name; see the manual entries for the library functions for details
|
||||
on what they do. Tcl also implements the following functions for
|
||||
conversion between integers and floating-point numbers:
|
||||
conversion between integers and floating-point numbers and the
|
||||
generation of random numbers:
|
||||
.TP
|
||||
\fBabs(\fIarg\fB)\fR
|
||||
Returns the absolute value of \fIarg\fR. \fIArg\fR may be either
|
||||
@ -216,13 +207,23 @@ If \fIarg\fR is a floating value, returns \fIarg\fR, otherwise converts
|
||||
If \fIarg\fR is an integer value, returns \fIarg\fR, otherwise converts
|
||||
\fIarg\fR to integer by truncation and returns the converted value.
|
||||
.TP
|
||||
\fBrand()\fR
|
||||
Returns a floating point number from zero to just less than one or,
|
||||
in mathematical terms, the range [0,1). The seed comes from the
|
||||
internal clock of the machine or may be set manual with the srand
|
||||
function.
|
||||
.TP
|
||||
\fBround(\fIarg\fB)\fR
|
||||
If \fIarg\fR is an integer value, returns \fIarg\fR, otherwise converts
|
||||
\fIarg\fR to integer by rounding and returns the converted value.
|
||||
.TP
|
||||
\fBsrand(\fIarg\fB)\fR
|
||||
The \fIarg\fR, which must be an integer, is used to reset the seed for
|
||||
the random number generator. Returns the first random number from
|
||||
that seed. Each interpreter has it's own seed.
|
||||
.PP
|
||||
In addition to these predefined functions, applications may
|
||||
define additional functions using \fBTcl_CreateMathFunc\fR().
|
||||
.VE
|
||||
.SH "TYPES, OVERFLOW, AND PRECISION"
|
||||
.PP
|
||||
All internal computations involving integers are done with the C type
|
||||
@ -252,24 +253,13 @@ returns 1, while
|
||||
\fBexpr 5 / ( [string length "abcd"] + 0.0 )\fR
|
||||
.CE
|
||||
both return 1.25.
|
||||
.VS
|
||||
Floating-point values are always returned with a ``.''
|
||||
or an ``e'' so that they will not look like integer values. For
|
||||
Floating-point values are always returned with a ``\fB.\fR''
|
||||
or an \fBe\fR so that they will not look like integer values. For
|
||||
example,
|
||||
.CS
|
||||
\fBexpr 20.0/5.0\fR
|
||||
.CE
|
||||
returns ``4.0'', not ``4''. The global variable \fBtcl_precision\fR
|
||||
determines the number of significant digits that are retained
|
||||
when floating values are converted to strings (except that trailing
|
||||
zeroes are omitted). If \fBtcl_precision\fR
|
||||
is unset then 6 digits of precision are used.
|
||||
To retain all of the significant bits of an IEEE floating-point
|
||||
number set \fBtcl_precision\fR to 17; if a value is converted to
|
||||
string with 17 digits of precision and then converted back to binary
|
||||
for some later calculation, the resulting binary value is guaranteed
|
||||
to be identical to the original one.
|
||||
.VE
|
||||
returns \fB4.0\fR, not \fB4\fR.
|
||||
|
||||
.SH "STRING OPERATIONS"
|
||||
.PP
|
||||
@ -287,14 +277,44 @@ For example, the commands
|
||||
.CE
|
||||
both return 1. The first comparison is done using integer
|
||||
comparison, and the second is done using string comparison after
|
||||
the second operand is converted to the string ``18''.
|
||||
.VS
|
||||
the second operand is converted to the string \fB18\fR.
|
||||
Because of Tcl's tendency to treat values as numbers whenever
|
||||
possible, it isn't generally a good idea to use operators like \fB==\fR
|
||||
when you really want string comparison and the values of the
|
||||
operands could be arbitrary; it's better in these cases to use the
|
||||
\fBstring compare\fR command instead.
|
||||
.VE
|
||||
|
||||
.SH "PERFORMANCE CONSIDERATIONS"
|
||||
.PP
|
||||
Enclose expressions in braces for the best speed and the smallest
|
||||
storage requirements.
|
||||
This allows the Tcl bytecode compiler to generate the best code.
|
||||
.PP
|
||||
As mentioned above, expressions are substituted twice:
|
||||
once by the Tcl parser and once by the \fBexpr\fR command.
|
||||
For example, the commands
|
||||
.CS
|
||||
\fBset a 3\fR
|
||||
\fBset b {$a + 2}\fR
|
||||
\fBexpr $b*4\fR
|
||||
.CE
|
||||
return 11, not a multiple of 4.
|
||||
This is because the Tcl parser will first substitute \fB$a + 2\fR for
|
||||
the variable \fBb\fR,
|
||||
then the \fBexpr\fR command will evaluate the expression \fB$a + 2*4\fR.
|
||||
.PP
|
||||
Most expressions do not require a second round of substitutions.
|
||||
Either they are enclosed in braces or, if not,
|
||||
their variable and command substitutions yield numbers or strings
|
||||
that don't themselves require substitutions.
|
||||
However, because a few unbraced expressions
|
||||
need two rounds of substitutions,
|
||||
the bytecode compiler must emit
|
||||
additional instructions to handle this situation.
|
||||
The most expensive code is required for
|
||||
unbraced expressions that contain command substitutions.
|
||||
These expressions must be implemented by generating new code
|
||||
each time the expression is executed.
|
||||
|
||||
.SH KEYWORDS
|
||||
arithmetic, boolean, compare, expression
|
||||
|
||||
@ -5,8 +5,7 @@
|
||||
'\" See the file "license.terms" for information on usage and redistribution
|
||||
'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
|
||||
'\"
|
||||
'\" SCCS: @(#) unknown.n 1.7 96/03/25 20:26:05
|
||||
'\" $Id$
|
||||
'\" SCCS: @(#) unknown.n 1.8 96/10/09 08:29:28
|
||||
'\"
|
||||
.so man.macros
|
||||
.TH unknown n "" Tcl "Tcl Built-In Commands"
|
||||
|
||||
989
contrib/tcl/unix/configure
vendored
989
contrib/tcl/unix/configure
vendored
File diff suppressed because it is too large
Load Diff
@ -9,7 +9,7 @@
|
||||
* See the file "license.terms" for information on usage and redistribution
|
||||
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
|
||||
*
|
||||
* SCCS: @(#) tclUnixTime.c 1.11 96/07/23 16:17:21
|
||||
* SCCS: @(#) tclUnixTime.c 1.12 97/01/08 17:38:15
|
||||
*/
|
||||
|
||||
#include "tclInt.h"
|
||||
@ -88,7 +88,8 @@ TclpGetClicks()
|
||||
* this function.
|
||||
*
|
||||
* Results:
|
||||
* Hours east of GMT.
|
||||
* The return value is the local time zone, measured in
|
||||
* minutes away from GMT (-ve for east, +ve for west).
|
||||
*
|
||||
* Side effects:
|
||||
* None.
|
||||
@ -137,6 +138,24 @@ TclpGetTimeZone (currentTime)
|
||||
return timeZone;
|
||||
#endif
|
||||
|
||||
#if defined(USE_DELTA_FOR_TZ)
|
||||
#define TCL_GOT_TIMEZONE 1
|
||||
/*
|
||||
* This hack replaces using global var timezone or gettimeofday
|
||||
* in situations where they are buggy such as on AIX when libbsd.a
|
||||
* is linked in.
|
||||
*/
|
||||
|
||||
int timeZone;
|
||||
time_t tt;
|
||||
struct tm *stm;
|
||||
tt = 849268800L; /* 1996-11-29 12:00:00 GMT */
|
||||
stm = localtime(&tt); /* eg 1996-11-29 6:00:00 CST6CDT */
|
||||
/* The calculation below assumes a max of +12 or -12 hours from GMT */
|
||||
timeZone = (12 - stm->tm_hour)*60 + (0 - stm->tm_min);
|
||||
return timeZone; /* eg +360 for CST6CDT */
|
||||
#endif
|
||||
|
||||
/*
|
||||
* Must prefer timezone variable over gettimeofday, as gettimeofday does
|
||||
* not return timezone information on many systems that have moved this
|
||||
@ -163,7 +182,7 @@ TclpGetTimeZone (currentTime)
|
||||
return timeZone;
|
||||
#endif
|
||||
|
||||
#if defined(HAVE_GETTIMEOFDAY) && !defined (TCL_GOT_TIMEZONE)
|
||||
#if !defined(NO_GETTOD) && !defined (TCL_GOT_TIMEZONE)
|
||||
# define TCL_GOT_TIMEZONE
|
||||
struct timeval tv;
|
||||
struct timezone tz;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user