Make tpa the default file format for Teapot
There turned out to be one blocking technical issue for full adpotion of
tpa format, and that was the fact that the printed representation of
floating values inside the tpa file might not reproduce the same double
when read. This change therefore introduces the "hexact" floating point
format, based on the the %La format string, which produces a hex
representation with exact round trips. While working on this, it was
convenient to add a new representation "compact" which is basically the
shorter of decimal and scientific representations, without trailing zeros.
This is now the default float format, but of course one can select decimal
or scientific formats to restore prior appearance. However, full-precision
compact format is now the (only) format for editing cell contents, as it
is accurate and efficient. Of course you can enter floating point values
in any format you like when typing in a formula.
The addition of several new floating point options overloaded the menus
in terminal teapot, so this change also revamps those menus slightly,
including eliminating the unused MenuChoice struct, and just specifying menus
with an array of strings.
Closes #63.
2019-08-24 16:58:46 +00:00
|
|
|
#ifndef NO_POSIX_SOURCE
|
|
|
|
#undef _POSIX_SOURCE
|
|
|
|
#define _POSIX_SOURCE 1
|
|
|
|
#undef _POSIX_C_SOURCE
|
|
|
|
#define _POSIX_C_SOURCE 2
|
|
|
|
#endif
|
2019-07-27 07:00:03 +00:00
|
|
|
|
|
|
|
#include <assert.h>
|
Make tpa the default file format for Teapot
There turned out to be one blocking technical issue for full adpotion of
tpa format, and that was the fact that the printed representation of
floating values inside the tpa file might not reproduce the same double
when read. This change therefore introduces the "hexact" floating point
format, based on the the %La format string, which produces a hex
representation with exact round trips. While working on this, it was
convenient to add a new representation "compact" which is basically the
shorter of decimal and scientific representations, without trailing zeros.
This is now the default float format, but of course one can select decimal
or scientific formats to restore prior appearance. However, full-precision
compact format is now the (only) format for editing cell contents, as it
is accurate and efficient. Of course you can enter floating point values
in any format you like when typing in a formula.
The addition of several new floating point options overloaded the menus
in terminal teapot, so this change also revamps those menus slightly,
including eliminating the unused MenuChoice struct, and just specifying menus
with an array of strings.
Closes #63.
2019-08-24 16:58:46 +00:00
|
|
|
#include <float.h>
|
|
|
|
#include <limits.h>
|
|
|
|
#include <stdlib.h>
|
|
|
|
#include <stdio.h>
|
2019-07-27 07:00:03 +00:00
|
|
|
#include <string.h>
|
|
|
|
|
Make tpa the default file format for Teapot
There turned out to be one blocking technical issue for full adpotion of
tpa format, and that was the fact that the printed representation of
floating values inside the tpa file might not reproduce the same double
when read. This change therefore introduces the "hexact" floating point
format, based on the the %La format string, which produces a hex
representation with exact round trips. While working on this, it was
convenient to add a new representation "compact" which is basically the
shorter of decimal and scientific representations, without trailing zeros.
This is now the default float format, but of course one can select decimal
or scientific formats to restore prior appearance. However, full-precision
compact format is now the (only) format for editing cell contents, as it
is accurate and efficient. Of course you can enter floating point values
in any format you like when typing in a formula.
The addition of several new floating point options overloaded the menus
in terminal teapot, so this change also revamps those menus slightly,
including eliminating the unused MenuChoice struct, and just specifying menus
with an array of strings.
Closes #63.
2019-08-24 16:58:46 +00:00
|
|
|
#include "cell.h"
|
2019-07-27 07:00:03 +00:00
|
|
|
#include "default.h"
|
|
|
|
#include "eval.h"
|
|
|
|
#include "main.h"
|
Make tpa the default file format for Teapot
There turned out to be one blocking technical issue for full adpotion of
tpa format, and that was the fact that the printed representation of
floating values inside the tpa file might not reproduce the same double
when read. This change therefore introduces the "hexact" floating point
format, based on the the %La format string, which produces a hex
representation with exact round trips. While working on this, it was
convenient to add a new representation "compact" which is basically the
shorter of decimal and scientific representations, without trailing zeros.
This is now the default float format, but of course one can select decimal
or scientific formats to restore prior appearance. However, full-precision
compact format is now the (only) format for editing cell contents, as it
is accurate and efficient. Of course you can enter floating point values
in any format you like when typing in a formula.
The addition of several new floating point options overloaded the menus
in terminal teapot, so this change also revamps those menus slightly,
including eliminating the unused MenuChoice struct, and just specifying menus
with an array of strings.
Closes #63.
2019-08-24 16:58:46 +00:00
|
|
|
#include "utf8.h"
|
|
|
|
|
|
|
|
const char *Adjust_Name[] =
|
|
|
|
{ [LEFT] = "Left", [RIGHT] = "Right", [CENTER] = "Center",
|
|
|
|
[AUTOADJUST] = "Auto"
|
|
|
|
};
|
|
|
|
|
|
|
|
const char Adjust_Char[] = "lrca";
|
|
|
|
|
|
|
|
const char *FloatFormat_Name[] =
|
|
|
|
{ [FLT_DECIMAL] = "Decimal", [FLT_SCIENTIFIC] = "Scientific",
|
|
|
|
[FLT_COMPACT] = "Compact", [FLT_HEXACT] = "Hexact"
|
|
|
|
};
|
|
|
|
|
|
|
|
const char FloatFormat_Char[] = "dsch";
|
2019-07-27 07:00:03 +00:00
|
|
|
|
Streamline internals of teapot
The primary change is to add a “funcall” token, so that an entire expression
can be encapsulated as a single token. This change is used to allow a cell to
include simply a selection of appropriate semantic tokens. I.e., the content
and iterative content are now each a single token like the value and the
result value. Token vectors are used only as intermediate results in scanning
and parsing.
Not this means the cells are now in effect storing parse trees, so
computation should be slightly faster and future extensions (like #56) should
be facilitated.
This commit also takes the opportunity while internals are being altered to
add another token to a cell for future use for computed attributes, cf #22,
and to change the internal numerical values from double and ints to long
doubles and long longs. However, the change attempts to encapsulate that
choice so it would be easy to change back or change to another representation.
Note that these changes break savexdr(), as the internal binary format of
a cell is now different. Rather than reimplement it, it is deprecated as
the world does not need another binary spreadsheet format. Hence, the
ascii format for teapot spreadsheets becomes the primary file format.
Loading of old xdr files is still supported for backward compatibility.
Closes #59.
Also along the way, various other slight fixes and enhancements crept in,
a partial but probably not exhaustive list of which follows:
Fixes #31.
Further revisions and improvements to documentation.
Make the approximate comparison of floating point values scale more
accurately with the size of the doubles being compared.
Further extensions of absolute and relative cell addressing.
Addition of (circle constant) tau function/constant.
Modified string conversion to simply use internal printing routines, and
to take "scientific" and "decimal" keywords.
Allowed n() function to take a list of values, or just a single location
defaulting to the current location.
Added floor, ceil, trunc, and round functions, and allowed them to be
keywords controlling the int() integer conversion function as well.
Allowed substr() to drop its last argument to go to the end of the string.
Provided an enum of built-in functions to preserve legacy function
identifiers, allowing the large table inside func.c to be reorganized
in a clearer fashion.
Added additional annotation of properties of the built-in functions,
including precedence.
All operators are now also accessible as built-in functions.
Made precedence of unary - lower than ^ to match python.
Avoided inadvertently using FLTK @symbol abbreviations for formulas with
"@" in them.
2019-08-23 19:12:06 +00:00
|
|
|
const char *ColorAspect_Name[] =
|
|
|
|
{ [FOREGROUND] = "Foreground", [BACKGROUND] = "Background"
|
|
|
|
};
|
2019-08-03 16:42:32 +00:00
|
|
|
const ColorNum DefaultCN[] =
|
|
|
|
{ [FOREGROUND] = 0, [BACKGROUND] = 16, [NUM_COLOR_ASPECTS] = 255 };
|
|
|
|
|
Streamline internals of teapot
The primary change is to add a “funcall” token, so that an entire expression
can be encapsulated as a single token. This change is used to allow a cell to
include simply a selection of appropriate semantic tokens. I.e., the content
and iterative content are now each a single token like the value and the
result value. Token vectors are used only as intermediate results in scanning
and parsing.
Not this means the cells are now in effect storing parse trees, so
computation should be slightly faster and future extensions (like #56) should
be facilitated.
This commit also takes the opportunity while internals are being altered to
add another token to a cell for future use for computed attributes, cf #22,
and to change the internal numerical values from double and ints to long
doubles and long longs. However, the change attempts to encapsulate that
choice so it would be easy to change back or change to another representation.
Note that these changes break savexdr(), as the internal binary format of
a cell is now different. Rather than reimplement it, it is deprecated as
the world does not need another binary spreadsheet format. Hence, the
ascii format for teapot spreadsheets becomes the primary file format.
Loading of old xdr files is still supported for backward compatibility.
Closes #59.
Also along the way, various other slight fixes and enhancements crept in,
a partial but probably not exhaustive list of which follows:
Fixes #31.
Further revisions and improvements to documentation.
Make the approximate comparison of floating point values scale more
accurately with the size of the doubles being compared.
Further extensions of absolute and relative cell addressing.
Addition of (circle constant) tau function/constant.
Modified string conversion to simply use internal printing routines, and
to take "scientific" and "decimal" keywords.
Allowed n() function to take a list of values, or just a single location
defaulting to the current location.
Added floor, ceil, trunc, and round functions, and allowed them to be
keywords controlling the int() integer conversion function as well.
Allowed substr() to drop its last argument to go to the end of the string.
Provided an enum of built-in functions to preserve legacy function
identifiers, allowing the large table inside func.c to be reorganized
in a clearer fashion.
Added additional annotation of properties of the built-in functions,
including precedence.
All operators are now also accessible as built-in functions.
Made precedence of unary - lower than ^ to match python.
Avoided inadvertently using FLTK @symbol abbreviations for formulas with
"@" in them.
2019-08-23 19:12:06 +00:00
|
|
|
const char *TokVariety_Name[] =
|
|
|
|
{ [BASE_CONT] = "Base Content", [ITER_CONT] = "Iterative Content",
|
|
|
|
[ATTR_REF] = "Attribute Reference", [CURR_VAL] = "Current Value",
|
|
|
|
[RES_VAL] = "Resultant Value", [CONTINGENT] = "Contingent Content"
|
|
|
|
};
|
|
|
|
|
2019-07-27 07:00:03 +00:00
|
|
|
/* initcellcontents - make a fresh cell into the "empty" one; don't worry
|
|
|
|
about freeing anything there, that will have been handled. */
|
|
|
|
void initcellcontents(Cell *fresh)
|
|
|
|
{
|
Streamline internals of teapot
The primary change is to add a “funcall” token, so that an entire expression
can be encapsulated as a single token. This change is used to allow a cell to
include simply a selection of appropriate semantic tokens. I.e., the content
and iterative content are now each a single token like the value and the
result value. Token vectors are used only as intermediate results in scanning
and parsing.
Not this means the cells are now in effect storing parse trees, so
computation should be slightly faster and future extensions (like #56) should
be facilitated.
This commit also takes the opportunity while internals are being altered to
add another token to a cell for future use for computed attributes, cf #22,
and to change the internal numerical values from double and ints to long
doubles and long longs. However, the change attempts to encapsulate that
choice so it would be easy to change back or change to another representation.
Note that these changes break savexdr(), as the internal binary format of
a cell is now different. Rather than reimplement it, it is deprecated as
the world does not need another binary spreadsheet format. Hence, the
ascii format for teapot spreadsheets becomes the primary file format.
Loading of old xdr files is still supported for backward compatibility.
Closes #59.
Also along the way, various other slight fixes and enhancements crept in,
a partial but probably not exhaustive list of which follows:
Fixes #31.
Further revisions and improvements to documentation.
Make the approximate comparison of floating point values scale more
accurately with the size of the doubles being compared.
Further extensions of absolute and relative cell addressing.
Addition of (circle constant) tau function/constant.
Modified string conversion to simply use internal printing routines, and
to take "scientific" and "decimal" keywords.
Allowed n() function to take a list of values, or just a single location
defaulting to the current location.
Added floor, ceil, trunc, and round functions, and allowed them to be
keywords controlling the int() integer conversion function as well.
Allowed substr() to drop its last argument to go to the end of the string.
Provided an enum of built-in functions to preserve legacy function
identifiers, allowing the large table inside func.c to be reorganized
in a clearer fashion.
Added additional annotation of properties of the built-in functions,
including precedence.
All operators are now also accessible as built-in functions.
Made precedence of unary - lower than ^ to match python.
Avoided inadvertently using FLTK @symbol abbreviations for formulas with
"@" in them.
2019-08-23 19:12:06 +00:00
|
|
|
for (TokVariety tv = BASE_CONT; tv < CONTINGENT; ++tv)
|
|
|
|
fresh->tok[tv].type = EMPTY;
|
|
|
|
fresh->label = NULL;
|
|
|
|
fresh->precision = -1;
|
Make tpa the default file format for Teapot
There turned out to be one blocking technical issue for full adpotion of
tpa format, and that was the fact that the printed representation of
floating values inside the tpa file might not reproduce the same double
when read. This change therefore introduces the "hexact" floating point
format, based on the the %La format string, which produces a hex
representation with exact round trips. While working on this, it was
convenient to add a new representation "compact" which is basically the
shorter of decimal and scientific representations, without trailing zeros.
This is now the default float format, but of course one can select decimal
or scientific formats to restore prior appearance. However, full-precision
compact format is now the (only) format for editing cell contents, as it
is accurate and efficient. Of course you can enter floating point values
in any format you like when typing in a formula.
The addition of several new floating point options overloaded the menus
in terminal teapot, so this change also revamps those menus slightly,
including eliminating the unused MenuChoice struct, and just specifying menus
with an array of strings.
Closes #63.
2019-08-24 16:58:46 +00:00
|
|
|
fresh->fform = DEF_FLOATFORM;
|
Streamline internals of teapot
The primary change is to add a “funcall” token, so that an entire expression
can be encapsulated as a single token. This change is used to allow a cell to
include simply a selection of appropriate semantic tokens. I.e., the content
and iterative content are now each a single token like the value and the
result value. Token vectors are used only as intermediate results in scanning
and parsing.
Not this means the cells are now in effect storing parse trees, so
computation should be slightly faster and future extensions (like #56) should
be facilitated.
This commit also takes the opportunity while internals are being altered to
add another token to a cell for future use for computed attributes, cf #22,
and to change the internal numerical values from double and ints to long
doubles and long longs. However, the change attempts to encapsulate that
choice so it would be easy to change back or change to another representation.
Note that these changes break savexdr(), as the internal binary format of
a cell is now different. Rather than reimplement it, it is deprecated as
the world does not need another binary spreadsheet format. Hence, the
ascii format for teapot spreadsheets becomes the primary file format.
Loading of old xdr files is still supported for backward compatibility.
Closes #59.
Also along the way, various other slight fixes and enhancements crept in,
a partial but probably not exhaustive list of which follows:
Fixes #31.
Further revisions and improvements to documentation.
Make the approximate comparison of floating point values scale more
accurately with the size of the doubles being compared.
Further extensions of absolute and relative cell addressing.
Addition of (circle constant) tau function/constant.
Modified string conversion to simply use internal printing routines, and
to take "scientific" and "decimal" keywords.
Allowed n() function to take a list of values, or just a single location
defaulting to the current location.
Added floor, ceil, trunc, and round functions, and allowed them to be
keywords controlling the int() integer conversion function as well.
Allowed substr() to drop its last argument to go to the end of the string.
Provided an enum of built-in functions to preserve legacy function
identifiers, allowing the large table inside func.c to be reorganized
in a clearer fashion.
Added additional annotation of properties of the built-in functions,
including precedence.
All operators are now also accessible as built-in functions.
Made precedence of unary - lower than ^ to match python.
Avoided inadvertently using FLTK @symbol abbreviations for formulas with
"@" in them.
2019-08-23 19:12:06 +00:00
|
|
|
fresh->adjust = AUTOADJUST;
|
2019-08-03 16:42:32 +00:00
|
|
|
for (ColorAspect a = FOREGROUND; a < NUM_COLOR_ASPECTS; ++a)
|
|
|
|
fresh->aspect[a] = DefaultCN[a];
|
Streamline internals of teapot
The primary change is to add a “funcall” token, so that an entire expression
can be encapsulated as a single token. This change is used to allow a cell to
include simply a selection of appropriate semantic tokens. I.e., the content
and iterative content are now each a single token like the value and the
result value. Token vectors are used only as intermediate results in scanning
and parsing.
Not this means the cells are now in effect storing parse trees, so
computation should be slightly faster and future extensions (like #56) should
be facilitated.
This commit also takes the opportunity while internals are being altered to
add another token to a cell for future use for computed attributes, cf #22,
and to change the internal numerical values from double and ints to long
doubles and long longs. However, the change attempts to encapsulate that
choice so it would be easy to change back or change to another representation.
Note that these changes break savexdr(), as the internal binary format of
a cell is now different. Rather than reimplement it, it is deprecated as
the world does not need another binary spreadsheet format. Hence, the
ascii format for teapot spreadsheets becomes the primary file format.
Loading of old xdr files is still supported for backward compatibility.
Closes #59.
Also along the way, various other slight fixes and enhancements crept in,
a partial but probably not exhaustive list of which follows:
Fixes #31.
Further revisions and improvements to documentation.
Make the approximate comparison of floating point values scale more
accurately with the size of the doubles being compared.
Further extensions of absolute and relative cell addressing.
Addition of (circle constant) tau function/constant.
Modified string conversion to simply use internal printing routines, and
to take "scientific" and "decimal" keywords.
Allowed n() function to take a list of values, or just a single location
defaulting to the current location.
Added floor, ceil, trunc, and round functions, and allowed them to be
keywords controlling the int() integer conversion function as well.
Allowed substr() to drop its last argument to go to the end of the string.
Provided an enum of built-in functions to preserve legacy function
identifiers, allowing the large table inside func.c to be reorganized
in a clearer fashion.
Added additional annotation of properties of the built-in functions,
including precedence.
All operators are now also accessible as built-in functions.
Made precedence of unary - lower than ^ to match python.
Avoided inadvertently using FLTK @symbol abbreviations for formulas with
"@" in them.
2019-08-23 19:12:06 +00:00
|
|
|
fresh->updated = 0;
|
|
|
|
fresh->shadowed = 0;
|
|
|
|
fresh->locked = 0;
|
|
|
|
fresh->transparent = 0;
|
|
|
|
fresh->ignored = 0;
|
|
|
|
fresh->clock_t0 = 0;
|
|
|
|
fresh->clock_t1 = 0;
|
|
|
|
fresh->clock_t2 = 0;
|
|
|
|
fresh->bold = 0;
|
|
|
|
fresh->underline = 0;
|
2019-07-27 07:00:03 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* getcont -- get contents */
|
Streamline internals of teapot
The primary change is to add a “funcall” token, so that an entire expression
can be encapsulated as a single token. This change is used to allow a cell to
include simply a selection of appropriate semantic tokens. I.e., the content
and iterative content are now each a single token like the value and the
result value. Token vectors are used only as intermediate results in scanning
and parsing.
Not this means the cells are now in effect storing parse trees, so
computation should be slightly faster and future extensions (like #56) should
be facilitated.
This commit also takes the opportunity while internals are being altered to
add another token to a cell for future use for computed attributes, cf #22,
and to change the internal numerical values from double and ints to long
doubles and long longs. However, the change attempts to encapsulate that
choice so it would be easy to change back or change to another representation.
Note that these changes break savexdr(), as the internal binary format of
a cell is now different. Rather than reimplement it, it is deprecated as
the world does not need another binary spreadsheet format. Hence, the
ascii format for teapot spreadsheets becomes the primary file format.
Loading of old xdr files is still supported for backward compatibility.
Closes #59.
Also along the way, various other slight fixes and enhancements crept in,
a partial but probably not exhaustive list of which follows:
Fixes #31.
Further revisions and improvements to documentation.
Make the approximate comparison of floating point values scale more
accurately with the size of the doubles being compared.
Further extensions of absolute and relative cell addressing.
Addition of (circle constant) tau function/constant.
Modified string conversion to simply use internal printing routines, and
to take "scientific" and "decimal" keywords.
Allowed n() function to take a list of values, or just a single location
defaulting to the current location.
Added floor, ceil, trunc, and round functions, and allowed them to be
keywords controlling the int() integer conversion function as well.
Allowed substr() to drop its last argument to go to the end of the string.
Provided an enum of built-in functions to preserve legacy function
identifiers, allowing the large table inside func.c to be reorganized
in a clearer fashion.
Added additional annotation of properties of the built-in functions,
including precedence.
All operators are now also accessible as built-in functions.
Made precedence of unary - lower than ^ to match python.
Avoided inadvertently using FLTK @symbol abbreviations for formulas with
"@" in them.
2019-08-23 19:12:06 +00:00
|
|
|
Token gettok(const Cell *cell, TokVariety v)
|
2019-07-27 07:00:03 +00:00
|
|
|
{
|
Streamline internals of teapot
The primary change is to add a “funcall” token, so that an entire expression
can be encapsulated as a single token. This change is used to allow a cell to
include simply a selection of appropriate semantic tokens. I.e., the content
and iterative content are now each a single token like the value and the
result value. Token vectors are used only as intermediate results in scanning
and parsing.
Not this means the cells are now in effect storing parse trees, so
computation should be slightly faster and future extensions (like #56) should
be facilitated.
This commit also takes the opportunity while internals are being altered to
add another token to a cell for future use for computed attributes, cf #22,
and to change the internal numerical values from double and ints to long
doubles and long longs. However, the change attempts to encapsulate that
choice so it would be easy to change back or change to another representation.
Note that these changes break savexdr(), as the internal binary format of
a cell is now different. Rather than reimplement it, it is deprecated as
the world does not need another binary spreadsheet format. Hence, the
ascii format for teapot spreadsheets becomes the primary file format.
Loading of old xdr files is still supported for backward compatibility.
Closes #59.
Also along the way, various other slight fixes and enhancements crept in,
a partial but probably not exhaustive list of which follows:
Fixes #31.
Further revisions and improvements to documentation.
Make the approximate comparison of floating point values scale more
accurately with the size of the doubles being compared.
Further extensions of absolute and relative cell addressing.
Addition of (circle constant) tau function/constant.
Modified string conversion to simply use internal printing routines, and
to take "scientific" and "decimal" keywords.
Allowed n() function to take a list of values, or just a single location
defaulting to the current location.
Added floor, ceil, trunc, and round functions, and allowed them to be
keywords controlling the int() integer conversion function as well.
Allowed substr() to drop its last argument to go to the end of the string.
Provided an enum of built-in functions to preserve legacy function
identifiers, allowing the large table inside func.c to be reorganized
in a clearer fashion.
Added additional annotation of properties of the built-in functions,
including precedence.
All operators are now also accessible as built-in functions.
Made precedence of unary - lower than ^ to match python.
Avoided inadvertently using FLTK @symbol abbreviations for formulas with
"@" in them.
2019-08-23 19:12:06 +00:00
|
|
|
Token emp;
|
|
|
|
emp.type = EMPTY;
|
|
|
|
if (cell == NULLCELL) return emp;
|
2019-07-27 07:00:03 +00:00
|
|
|
if (v == CONTINGENT)
|
Streamline internals of teapot
The primary change is to add a “funcall” token, so that an entire expression
can be encapsulated as a single token. This change is used to allow a cell to
include simply a selection of appropriate semantic tokens. I.e., the content
and iterative content are now each a single token like the value and the
result value. Token vectors are used only as intermediate results in scanning
and parsing.
Not this means the cells are now in effect storing parse trees, so
computation should be slightly faster and future extensions (like #56) should
be facilitated.
This commit also takes the opportunity while internals are being altered to
add another token to a cell for future use for computed attributes, cf #22,
and to change the internal numerical values from double and ints to long
doubles and long longs. However, the change attempts to encapsulate that
choice so it would be easy to change back or change to another representation.
Note that these changes break savexdr(), as the internal binary format of
a cell is now different. Rather than reimplement it, it is deprecated as
the world does not need another binary spreadsheet format. Hence, the
ascii format for teapot spreadsheets becomes the primary file format.
Loading of old xdr files is still supported for backward compatibility.
Closes #59.
Also along the way, various other slight fixes and enhancements crept in,
a partial but probably not exhaustive list of which follows:
Fixes #31.
Further revisions and improvements to documentation.
Make the approximate comparison of floating point values scale more
accurately with the size of the doubles being compared.
Further extensions of absolute and relative cell addressing.
Addition of (circle constant) tau function/constant.
Modified string conversion to simply use internal printing routines, and
to take "scientific" and "decimal" keywords.
Allowed n() function to take a list of values, or just a single location
defaulting to the current location.
Added floor, ceil, trunc, and round functions, and allowed them to be
keywords controlling the int() integer conversion function as well.
Allowed substr() to drop its last argument to go to the end of the string.
Provided an enum of built-in functions to preserve legacy function
identifiers, allowing the large table inside func.c to be reorganized
in a clearer fashion.
Added additional annotation of properties of the built-in functions,
including precedence.
All operators are now also accessible as built-in functions.
Made precedence of unary - lower than ^ to match python.
Avoided inadvertently using FLTK @symbol abbreviations for formulas with
"@" in them.
2019-08-23 19:12:06 +00:00
|
|
|
v = (cell->clock_t0 && cell->tok[ITER_CONT].type != EMPTY)
|
|
|
|
? ITER_CONT : BASE_CONT;
|
|
|
|
return cell->tok[v];
|
2019-07-27 07:00:03 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* getadjust -- get cell adjustment */
|
|
|
|
Adjust getadjust(const Cell* cell)
|
|
|
|
{
|
|
|
|
if (cell == NULLCELL) return LEFT;
|
|
|
|
else if (cell->adjust == AUTOADJUST)
|
Streamline internals of teapot
The primary change is to add a “funcall” token, so that an entire expression
can be encapsulated as a single token. This change is used to allow a cell to
include simply a selection of appropriate semantic tokens. I.e., the content
and iterative content are now each a single token like the value and the
result value. Token vectors are used only as intermediate results in scanning
and parsing.
Not this means the cells are now in effect storing parse trees, so
computation should be slightly faster and future extensions (like #56) should
be facilitated.
This commit also takes the opportunity while internals are being altered to
add another token to a cell for future use for computed attributes, cf #22,
and to change the internal numerical values from double and ints to long
doubles and long longs. However, the change attempts to encapsulate that
choice so it would be easy to change back or change to another representation.
Note that these changes break savexdr(), as the internal binary format of
a cell is now different. Rather than reimplement it, it is deprecated as
the world does not need another binary spreadsheet format. Hence, the
ascii format for teapot spreadsheets becomes the primary file format.
Loading of old xdr files is still supported for backward compatibility.
Closes #59.
Also along the way, various other slight fixes and enhancements crept in,
a partial but probably not exhaustive list of which follows:
Fixes #31.
Further revisions and improvements to documentation.
Make the approximate comparison of floating point values scale more
accurately with the size of the doubles being compared.
Further extensions of absolute and relative cell addressing.
Addition of (circle constant) tau function/constant.
Modified string conversion to simply use internal printing routines, and
to take "scientific" and "decimal" keywords.
Allowed n() function to take a list of values, or just a single location
defaulting to the current location.
Added floor, ceil, trunc, and round functions, and allowed them to be
keywords controlling the int() integer conversion function as well.
Allowed substr() to drop its last argument to go to the end of the string.
Provided an enum of built-in functions to preserve legacy function
identifiers, allowing the large table inside func.c to be reorganized
in a clearer fashion.
Added additional annotation of properties of the built-in functions,
including precedence.
All operators are now also accessible as built-in functions.
Made precedence of unary - lower than ^ to match python.
Avoided inadvertently using FLTK @symbol abbreviations for formulas with
"@" in them.
2019-08-23 19:12:06 +00:00
|
|
|
return (cell->tok[CURR_VAL].type == INT
|
|
|
|
|| cell->tok[CURR_VAL].type == FLOAT) ? RIGHT : LEFT;
|
2019-07-27 07:00:03 +00:00
|
|
|
else return cell->adjust;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* shadowed -- is cell shadowed? */
|
|
|
|
bool shadowed(const Cell *cell)
|
|
|
|
{
|
|
|
|
return (cell != NULLCELL) && cell->shadowed;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* isbold -- is cell bold? */
|
|
|
|
bool isbold(const Cell* cell)
|
|
|
|
{
|
|
|
|
return (cell != NULLCELL) && cell->bold;
|
|
|
|
}
|
|
|
|
|
2019-08-03 16:42:32 +00:00
|
|
|
/* getcolor -- a color associated to cell */
|
|
|
|
ColorNum getcolor(const Cell* cell, ColorAspect aspect)
|
2019-08-03 03:21:58 +00:00
|
|
|
{
|
2019-08-03 16:42:32 +00:00
|
|
|
return cell == NULLCELL ? DefaultCN[aspect] : cell->aspect[aspect];
|
2019-08-03 03:21:58 +00:00
|
|
|
}
|
|
|
|
|
2019-07-27 07:00:03 +00:00
|
|
|
/* isunderline -- is cell underlined? */
|
|
|
|
bool underlined(const Cell *cell)
|
|
|
|
{
|
|
|
|
return (cell != NULLCELL) && cell->underline;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* locked -- is cell locked? */
|
|
|
|
bool locked(const Cell *cell)
|
|
|
|
{
|
|
|
|
return (cell != NULLCELL) && cell->locked;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* transparent -- is cell transparent? */
|
|
|
|
bool transparent(const Cell* cell)
|
|
|
|
{
|
|
|
|
return (cell != NULLCELL) && cell->transparent;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* ignored -- is cell ignored? */
|
|
|
|
bool ignored(const Cell *cell)
|
|
|
|
{
|
|
|
|
return (cell != NULLCELL) && cell->ignored;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
Make tpa the default file format for Teapot
There turned out to be one blocking technical issue for full adpotion of
tpa format, and that was the fact that the printed representation of
floating values inside the tpa file might not reproduce the same double
when read. This change therefore introduces the "hexact" floating point
format, based on the the %La format string, which produces a hex
representation with exact round trips. While working on this, it was
convenient to add a new representation "compact" which is basically the
shorter of decimal and scientific representations, without trailing zeros.
This is now the default float format, but of course one can select decimal
or scientific formats to restore prior appearance. However, full-precision
compact format is now the (only) format for editing cell contents, as it
is accurate and efficient. Of course you can enter floating point values
in any format you like when typing in a formula.
The addition of several new floating point options overloaded the menus
in terminal teapot, so this change also revamps those menus slightly,
including eliminating the unused MenuChoice struct, and just specifying menus
with an array of strings.
Closes #63.
2019-08-24 16:58:46 +00:00
|
|
|
/* getfltformat -- float format for numbers */
|
|
|
|
FloatFormat getfltformat(const Cell *cell )
|
2019-07-27 07:00:03 +00:00
|
|
|
{
|
Make tpa the default file format for Teapot
There turned out to be one blocking technical issue for full adpotion of
tpa format, and that was the fact that the printed representation of
floating values inside the tpa file might not reproduce the same double
when read. This change therefore introduces the "hexact" floating point
format, based on the the %La format string, which produces a hex
representation with exact round trips. While working on this, it was
convenient to add a new representation "compact" which is basically the
shorter of decimal and scientific representations, without trailing zeros.
This is now the default float format, but of course one can select decimal
or scientific formats to restore prior appearance. However, full-precision
compact format is now the (only) format for editing cell contents, as it
is accurate and efficient. Of course you can enter floating point values
in any format you like when typing in a formula.
The addition of several new floating point options overloaded the menus
in terminal teapot, so this change also revamps those menus slightly,
including eliminating the unused MenuChoice struct, and just specifying menus
with an array of strings.
Closes #63.
2019-08-24 16:58:46 +00:00
|
|
|
return (cell == NULLCELL) ? DEF_FLOATFORM : cell->fform;
|
2019-07-27 07:00:03 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* getprecision -- get cell precision */
|
|
|
|
int getprecision(const Cell *cell)
|
|
|
|
{
|
|
|
|
if (cell == NULLCELL || cell->precision == -1) return def_precision;
|
|
|
|
return cell->precision;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* getlabel -- get cell label */
|
|
|
|
const char *getlabel(const Cell* cell)
|
|
|
|
{
|
|
|
|
if (cell == NULLCELL || cell->label == (char*)0) return "";
|
|
|
|
return cell->label;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* copytokens -- copy a sequence of tokens, possibly reallocating dest */
|
|
|
|
static void copytokens(Token*** totoks, Token** fromtoks)
|
|
|
|
{
|
|
|
|
size_t from_len = tveclen(fromtoks);
|
|
|
|
if (from_len == 0)
|
|
|
|
{
|
|
|
|
tvecfree(*totoks);
|
|
|
|
*totoks = EMPTY_TVEC;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
size_t to_len = tveclen(*totoks);
|
|
|
|
if (from_len > to_len || *totoks == fromtoks)
|
|
|
|
{
|
|
|
|
if (*totoks != fromtoks) tvecfree(*totoks);
|
|
|
|
*totoks = malloc((from_len+1)*sizeof(Token*));
|
|
|
|
(*totoks)[from_len] = NULLTOKEN;
|
|
|
|
} else {
|
|
|
|
tvecfreetoks(*totoks);
|
|
|
|
}
|
|
|
|
for (size_t i = 0; i<from_len; ++i) /* destination already has NULLTOKEN at end */
|
|
|
|
{
|
|
|
|
if (fromtoks[i] == NULLTOKEN) (*totoks)[i] = NULLTOKEN;
|
|
|
|
else
|
|
|
|
{
|
|
|
|
(*totoks)[i] = malloc(sizeof(Token));
|
|
|
|
*((*totoks)[i]) = tcopy(*(fromtoks[i]));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* freecellcontents -- free the resources of the cell at destruction time */
|
|
|
|
void freecellcontents(Cell *faded)
|
|
|
|
{
|
Streamline internals of teapot
The primary change is to add a “funcall” token, so that an entire expression
can be encapsulated as a single token. This change is used to allow a cell to
include simply a selection of appropriate semantic tokens. I.e., the content
and iterative content are now each a single token like the value and the
result value. Token vectors are used only as intermediate results in scanning
and parsing.
Not this means the cells are now in effect storing parse trees, so
computation should be slightly faster and future extensions (like #56) should
be facilitated.
This commit also takes the opportunity while internals are being altered to
add another token to a cell for future use for computed attributes, cf #22,
and to change the internal numerical values from double and ints to long
doubles and long longs. However, the change attempts to encapsulate that
choice so it would be easy to change back or change to another representation.
Note that these changes break savexdr(), as the internal binary format of
a cell is now different. Rather than reimplement it, it is deprecated as
the world does not need another binary spreadsheet format. Hence, the
ascii format for teapot spreadsheets becomes the primary file format.
Loading of old xdr files is still supported for backward compatibility.
Closes #59.
Also along the way, various other slight fixes and enhancements crept in,
a partial but probably not exhaustive list of which follows:
Fixes #31.
Further revisions and improvements to documentation.
Make the approximate comparison of floating point values scale more
accurately with the size of the doubles being compared.
Further extensions of absolute and relative cell addressing.
Addition of (circle constant) tau function/constant.
Modified string conversion to simply use internal printing routines, and
to take "scientific" and "decimal" keywords.
Allowed n() function to take a list of values, or just a single location
defaulting to the current location.
Added floor, ceil, trunc, and round functions, and allowed them to be
keywords controlling the int() integer conversion function as well.
Allowed substr() to drop its last argument to go to the end of the string.
Provided an enum of built-in functions to preserve legacy function
identifiers, allowing the large table inside func.c to be reorganized
in a clearer fashion.
Added additional annotation of properties of the built-in functions,
including precedence.
All operators are now also accessible as built-in functions.
Made precedence of unary - lower than ^ to match python.
Avoided inadvertently using FLTK @symbol abbreviations for formulas with
"@" in them.
2019-08-23 19:12:06 +00:00
|
|
|
for (TokVariety tv = BASE_CONT; tv < CONTINGENT; ++tv)
|
|
|
|
tfree(&(faded->tok[tv]));
|
|
|
|
if (faded->label != NULL) free(faded->label);
|
2019-07-27 07:00:03 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* copycell - copies one Cell to another, handling any allocation issues */
|
Streamline internals of teapot
The primary change is to add a “funcall” token, so that an entire expression
can be encapsulated as a single token. This change is used to allow a cell to
include simply a selection of appropriate semantic tokens. I.e., the content
and iterative content are now each a single token like the value and the
result value. Token vectors are used only as intermediate results in scanning
and parsing.
Not this means the cells are now in effect storing parse trees, so
computation should be slightly faster and future extensions (like #56) should
be facilitated.
This commit also takes the opportunity while internals are being altered to
add another token to a cell for future use for computed attributes, cf #22,
and to change the internal numerical values from double and ints to long
doubles and long longs. However, the change attempts to encapsulate that
choice so it would be easy to change back or change to another representation.
Note that these changes break savexdr(), as the internal binary format of
a cell is now different. Rather than reimplement it, it is deprecated as
the world does not need another binary spreadsheet format. Hence, the
ascii format for teapot spreadsheets becomes the primary file format.
Loading of old xdr files is still supported for backward compatibility.
Closes #59.
Also along the way, various other slight fixes and enhancements crept in,
a partial but probably not exhaustive list of which follows:
Fixes #31.
Further revisions and improvements to documentation.
Make the approximate comparison of floating point values scale more
accurately with the size of the doubles being compared.
Further extensions of absolute and relative cell addressing.
Addition of (circle constant) tau function/constant.
Modified string conversion to simply use internal printing routines, and
to take "scientific" and "decimal" keywords.
Allowed n() function to take a list of values, or just a single location
defaulting to the current location.
Added floor, ceil, trunc, and round functions, and allowed them to be
keywords controlling the int() integer conversion function as well.
Allowed substr() to drop its last argument to go to the end of the string.
Provided an enum of built-in functions to preserve legacy function
identifiers, allowing the large table inside func.c to be reorganized
in a clearer fashion.
Added additional annotation of properties of the built-in functions,
including precedence.
All operators are now also accessible as built-in functions.
Made precedence of unary - lower than ^ to match python.
Avoided inadvertently using FLTK @symbol abbreviations for formulas with
"@" in them.
2019-08-23 19:12:06 +00:00
|
|
|
void copycell(Cell *to, const Cell *fromcell, LabelHandling lh)
|
2019-07-27 07:00:03 +00:00
|
|
|
{
|
|
|
|
assert(to != NULLCELL);
|
2019-07-27 08:08:42 +00:00
|
|
|
if (to == fromcell) return;
|
2019-07-27 07:00:03 +00:00
|
|
|
|
|
|
|
freecellcontents(to);
|
|
|
|
if (fromcell != NULLCELL) {
|
|
|
|
memcpy(to, fromcell, sizeof(Cell));
|
Streamline internals of teapot
The primary change is to add a “funcall” token, so that an entire expression
can be encapsulated as a single token. This change is used to allow a cell to
include simply a selection of appropriate semantic tokens. I.e., the content
and iterative content are now each a single token like the value and the
result value. Token vectors are used only as intermediate results in scanning
and parsing.
Not this means the cells are now in effect storing parse trees, so
computation should be slightly faster and future extensions (like #56) should
be facilitated.
This commit also takes the opportunity while internals are being altered to
add another token to a cell for future use for computed attributes, cf #22,
and to change the internal numerical values from double and ints to long
doubles and long longs. However, the change attempts to encapsulate that
choice so it would be easy to change back or change to another representation.
Note that these changes break savexdr(), as the internal binary format of
a cell is now different. Rather than reimplement it, it is deprecated as
the world does not need another binary spreadsheet format. Hence, the
ascii format for teapot spreadsheets becomes the primary file format.
Loading of old xdr files is still supported for backward compatibility.
Closes #59.
Also along the way, various other slight fixes and enhancements crept in,
a partial but probably not exhaustive list of which follows:
Fixes #31.
Further revisions and improvements to documentation.
Make the approximate comparison of floating point values scale more
accurately with the size of the doubles being compared.
Further extensions of absolute and relative cell addressing.
Addition of (circle constant) tau function/constant.
Modified string conversion to simply use internal printing routines, and
to take "scientific" and "decimal" keywords.
Allowed n() function to take a list of values, or just a single location
defaulting to the current location.
Added floor, ceil, trunc, and round functions, and allowed them to be
keywords controlling the int() integer conversion function as well.
Allowed substr() to drop its last argument to go to the end of the string.
Provided an enum of built-in functions to preserve legacy function
identifiers, allowing the large table inside func.c to be reorganized
in a clearer fashion.
Added additional annotation of properties of the built-in functions,
including precedence.
All operators are now also accessible as built-in functions.
Made precedence of unary - lower than ^ to match python.
Avoided inadvertently using FLTK @symbol abbreviations for formulas with
"@" in them.
2019-08-23 19:12:06 +00:00
|
|
|
for (TokVariety tv = BASE_CONT; tv < CONTINGENT; ++tv)
|
|
|
|
if (tv <= MAX_PERSIST_TV) to->tok[tv] = tcopy(fromcell->tok[tv]);
|
|
|
|
else to->tok[tv].type = EMPTY;
|
|
|
|
if (lh != PRESERVE_LABEL && fromcell->label != (char*)0) {
|
2019-07-27 07:00:03 +00:00
|
|
|
size_t len = strlen(fromcell->label);
|
|
|
|
to->label = strcpy(malloc(len+2), fromcell->label);
|
|
|
|
(to->label)[len] = '_';
|
|
|
|
(to->label)[len+1] = '\0';
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
initcellcontents(to);
|
|
|
|
}
|
|
|
|
}
|
Make tpa the default file format for Teapot
There turned out to be one blocking technical issue for full adpotion of
tpa format, and that was the fact that the printed representation of
floating values inside the tpa file might not reproduce the same double
when read. This change therefore introduces the "hexact" floating point
format, based on the the %La format string, which produces a hex
representation with exact round trips. While working on this, it was
convenient to add a new representation "compact" which is basically the
shorter of decimal and scientific representations, without trailing zeros.
This is now the default float format, but of course one can select decimal
or scientific formats to restore prior appearance. However, full-precision
compact format is now the (only) format for editing cell contents, as it
is accurate and efficient. Of course you can enter floating point values
in any format you like when typing in a formula.
The addition of several new floating point options overloaded the menus
in terminal teapot, so this change also revamps those menus slightly,
including eliminating the unused MenuChoice struct, and just specifying menus
with an array of strings.
Closes #63.
2019-08-24 16:58:46 +00:00
|
|
|
|
|
|
|
/* print_fident -- print a field identifier to a dest and return the number
|
|
|
|
of characters written
|
|
|
|
*/ /*{{{*/
|
|
|
|
static int print_fident(char* dest, size_t space, FunctionIdentifier id)
|
|
|
|
{
|
|
|
|
size_t identlen = strlen(tfunc[id].name);
|
|
|
|
if ((identlen+1) < space) strcpy(dest, tfunc[id].name);
|
|
|
|
else {
|
|
|
|
(void)strncpy(dest, tfunc[id].name, space);
|
|
|
|
dest[space-1] = '\0';
|
|
|
|
}
|
|
|
|
return identlen;
|
|
|
|
}
|
|
|
|
/*}}}*/
|
|
|
|
|
|
|
|
/* print_string -- print a string value to a dest and return the number of
|
|
|
|
characters written
|
|
|
|
*/ /*{{{*/
|
|
|
|
static int print_string(char* dest, size_t space,
|
|
|
|
const char *str, StringFormat sf)
|
|
|
|
{
|
|
|
|
size_t cur = 0;
|
|
|
|
if (sf == QUOTE_STRING && cur < space) dest[cur++] = '"';
|
|
|
|
for ( ; cur < space && *str != '\0'; ++str)
|
|
|
|
{
|
|
|
|
if (sf == QUOTE_STRING && (*str == '"' || *str=='\\')) dest[cur++] = '\\';
|
|
|
|
if (cur < space) dest[cur++] = *str;
|
|
|
|
}
|
|
|
|
if (sf == QUOTE_STRING && cur < space) dest[cur++] = '"';
|
|
|
|
return cur;
|
|
|
|
}
|
|
|
|
/*}}}*/
|
|
|
|
|
|
|
|
/* printtok -- print a single token, passed by address, although not changed */ /*{{{*/
|
2019-08-24 22:17:35 +00:00
|
|
|
size_t ptokatprec(char* dest, size_t size, size_t field_width, StringFormat sf,
|
|
|
|
FloatFormat ff, int digits, ErrorFormat ef, const Token *tok,
|
|
|
|
FunctionPrecedence atprec)
|
Make tpa the default file format for Teapot
There turned out to be one blocking technical issue for full adpotion of
tpa format, and that was the fact that the printed representation of
floating values inside the tpa file might not reproduce the same double
when read. This change therefore introduces the "hexact" floating point
format, based on the the %La format string, which produces a hex
representation with exact round trips. While working on this, it was
convenient to add a new representation "compact" which is basically the
shorter of decimal and scientific representations, without trailing zeros.
This is now the default float format, but of course one can select decimal
or scientific formats to restore prior appearance. However, full-precision
compact format is now the (only) format for editing cell contents, as it
is accurate and efficient. Of course you can enter floating point values
in any format you like when typing in a formula.
The addition of several new floating point options overloaded the menus
in terminal teapot, so this change also revamps those menus slightly,
including eliminating the unused MenuChoice struct, and just specifying menus
with an array of strings.
Closes #63.
2019-08-24 16:58:46 +00:00
|
|
|
{
|
|
|
|
if (debug_level > 2) {
|
|
|
|
printf("..Entering printtok; bufsize %d, field_width %d, qs %d, ff %s,"
|
|
|
|
"prec %d, verr %d\n",
|
|
|
|
size, field_width, sf, FloatFormat_Name[ff], digits, ef);
|
|
|
|
}
|
|
|
|
if (size > 0 ) *dest = '\0';
|
|
|
|
if (tok == NULLTOKEN || tok->type == EMPTY) return 0;
|
|
|
|
size_t cur = 0;
|
|
|
|
switch (tok->type)
|
|
|
|
{
|
|
|
|
/* STRING */
|
|
|
|
case STRING: cur += print_string(dest, size-cur, tok->u.string, sf); break;
|
|
|
|
/* INT */ /*{{{*/
|
|
|
|
case INT:
|
|
|
|
{
|
|
|
|
char buf[64];
|
|
|
|
size_t buflen;
|
|
|
|
|
|
|
|
buflen = sprintf(buf, INT_T_FMT, tok->u.integer);
|
|
|
|
assert(buflen < sizeof(buf));
|
|
|
|
(void)strncpy(dest+cur,buf,size-cur-1);
|
|
|
|
cur+=buflen;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
/*}}}*/
|
|
|
|
/* FLOAT */ /*{{{*/
|
|
|
|
case FLOAT:
|
|
|
|
{
|
|
|
|
/* variables */ /*{{{*/
|
|
|
|
char buf[1100], buf2[1100], *use, *p;
|
|
|
|
size_t len, len2;
|
|
|
|
/*}}}*/
|
|
|
|
|
|
|
|
if (digits <= 0) digits += FLT_T_DIG;
|
|
|
|
if (digits > sizeof(buf) - 20) digits = sizeof(buf) - 20;
|
|
|
|
switch (ff) {
|
|
|
|
case FLT_DECIMAL:
|
|
|
|
len = sprintf(buf, FLT_T_STD_FMT, digits, tok->u.flt);
|
|
|
|
use = buf;
|
|
|
|
break;
|
|
|
|
case FLT_SCIENTIFIC:
|
|
|
|
len = sprintf(buf, FLT_T_SCI_FMT, digits, tok->u.flt);
|
|
|
|
use = buf;
|
|
|
|
break;
|
|
|
|
case FLT_COMPACT:
|
|
|
|
len = sprintf(buf, FLT_T_CPT_FMT, digits, tok->u.flt);
|
|
|
|
/* Unfortunately, %g is so clever that sometimes it omits the
|
|
|
|
decimal; it also has a penchant for not switching to scientific
|
|
|
|
notation until the magnitude gets very large. So we try to
|
|
|
|
counteract these bad tendencies here. If there is no decimal,
|
|
|
|
we take the shorter of %.1f and %e with the same number of digits.
|
|
|
|
*/
|
|
|
|
use = buf;
|
|
|
|
if (strchr(buf, '.') == NULL) {
|
|
|
|
len = sprintf(buf, FLT_T_STD_FMT, 1, tok->u.flt);
|
|
|
|
len2 = sprintf(buf2, FLT_T_SCI_FMT, digits, tok->u.flt);
|
|
|
|
/* remove trailing 0s from sci format to be fair */
|
|
|
|
size_t epos = strchr(buf2, 'e') - buf2;
|
|
|
|
size_t tpos = epos;
|
|
|
|
while (tpos > 1 && buf2[tpos-1] == '0' && buf2[tpos-2] != '.') --tpos;
|
|
|
|
if (tpos < epos) {
|
|
|
|
memmove(buf2+tpos, buf2+epos, len2-epos+1);
|
|
|
|
len2 -= epos - tpos;
|
|
|
|
}
|
|
|
|
if (len2 < len) { use = buf2; len = len2; }
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case FLT_HEXACT:
|
|
|
|
len = sprintf(buf, FLT_T_HEX_FMT, tok->u.flt);
|
|
|
|
use = buf;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
assert(len < sizeof(buf));
|
|
|
|
p = use + len;
|
|
|
|
while (*--p == ' ') { *p = '\0'; --len; }
|
|
|
|
(void)strncpy(dest+cur, use, size-cur-1);
|
|
|
|
cur += len;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
/*}}}*/
|
|
|
|
/* OPERATOR */ /*{{{*/
|
|
|
|
case OPERATOR:
|
|
|
|
{
|
|
|
|
static const char *ops[]={ "+", "-", "*", "/", "(", ")", ",", "<", "<=", ">=", ">", "==", "~=", "!=", "^", "%" };
|
|
|
|
|
|
|
|
if ((size-cur)>1)
|
|
|
|
{
|
|
|
|
dest[cur++]=*ops[tok->u.op];
|
|
|
|
if (*(ops[tok->u.op]+1) && size>cur) dest[cur++]=*(ops[tok->u.op]+1);
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
/*}}}*/
|
|
|
|
/* LIDENT */ /*{{{*/
|
|
|
|
case LIDENT:
|
|
|
|
{
|
|
|
|
size_t identlen;
|
|
|
|
|
|
|
|
identlen=strlen(tok->u.lident);
|
|
|
|
if ((cur+identlen+1)<=size) strcpy(dest+cur,tok->u.lident);
|
|
|
|
else (void)strncpy(dest+cur,tok->u.lident,size-cur-1);
|
|
|
|
cur+=identlen;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
/*}}}*/
|
|
|
|
/* FIDENT */ /*{{{*/
|
|
|
|
case FIDENT:
|
|
|
|
if (debug_level > 2) {
|
|
|
|
printf("...Found function [%s].\n", tfunc[tok->u.fident].name);
|
|
|
|
}
|
|
|
|
cur += print_fident(dest+cur, size-cur-1, tok->u.fident);
|
|
|
|
break;
|
|
|
|
/*}}}*/
|
|
|
|
/* LOCATION */ /*{{{*/
|
|
|
|
case LOCATION:
|
|
|
|
{
|
|
|
|
char buf[60];
|
|
|
|
|
|
|
|
sprintf(buf,"&(%d,%d,%d)",tok->u.location[0],tok->u.location[1],tok->u.location[2]);
|
|
|
|
(void)strncpy(dest+cur,buf,size-cur-1);
|
|
|
|
cur+=strlen(buf);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
/*}}}*/
|
|
|
|
/* FUNCALL */ /*{{{*/
|
|
|
|
case FUNCALL:
|
|
|
|
{
|
2019-08-24 22:17:35 +00:00
|
|
|
FunctionIdentifier fid = tok->u.funcall.fident;
|
|
|
|
if (tok->u.funcall.argc <= 0)
|
Make tpa the default file format for Teapot
There turned out to be one blocking technical issue for full adpotion of
tpa format, and that was the fact that the printed representation of
floating values inside the tpa file might not reproduce the same double
when read. This change therefore introduces the "hexact" floating point
format, based on the the %La format string, which produces a hex
representation with exact round trips. While working on this, it was
convenient to add a new representation "compact" which is basically the
shorter of decimal and scientific representations, without trailing zeros.
This is now the default float format, but of course one can select decimal
or scientific formats to restore prior appearance. However, full-precision
compact format is now the (only) format for editing cell contents, as it
is accurate and efficient. Of course you can enter floating point values
in any format you like when typing in a formula.
The addition of several new floating point options overloaded the menus
in terminal teapot, so this change also revamps those menus slightly,
including eliminating the unused MenuChoice struct, and just specifying menus
with an array of strings.
Closes #63.
2019-08-24 16:58:46 +00:00
|
|
|
{
|
2019-08-24 22:17:35 +00:00
|
|
|
cur += print_fident(dest+cur, size-cur-1, fid);
|
|
|
|
if (tok->u.funcall.argc == 0)
|
|
|
|
{
|
|
|
|
if (cur < size - 2) { dest[cur++] = '('; dest[cur++] = ')'; }
|
|
|
|
else cur += 2;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
FunctionPrecedence fp = tfunc[fid].precedence;
|
|
|
|
switch (fp)
|
|
|
|
{
|
|
|
|
case PREFIX_FUNC: {
|
|
|
|
cur += print_fident(dest+cur, size-cur-1, fid);
|
|
|
|
if (cur < size) dest[cur++] = '(';
|
Make tpa the default file format for Teapot
There turned out to be one blocking technical issue for full adpotion of
tpa format, and that was the fact that the printed representation of
floating values inside the tpa file might not reproduce the same double
when read. This change therefore introduces the "hexact" floating point
format, based on the the %La format string, which produces a hex
representation with exact round trips. While working on this, it was
convenient to add a new representation "compact" which is basically the
shorter of decimal and scientific representations, without trailing zeros.
This is now the default float format, but of course one can select decimal
or scientific formats to restore prior appearance. However, full-precision
compact format is now the (only) format for editing cell contents, as it
is accurate and efficient. Of course you can enter floating point values
in any format you like when typing in a formula.
The addition of several new floating point options overloaded the menus
in terminal teapot, so this change also revamps those menus slightly,
including eliminating the unused MenuChoice struct, and just specifying menus
with an array of strings.
Closes #63.
2019-08-24 16:58:46 +00:00
|
|
|
for (size_t ai = 0; ai < tok->u.funcall.argc && cur < size-1; ++ai)
|
|
|
|
{
|
|
|
|
if (ai > 0 && cur < size) dest[cur++] = ',';
|
2019-08-24 22:17:35 +00:00
|
|
|
/* The commas eliminate the need for precedence worries in arguments*/
|
|
|
|
cur += ptokatprec(dest+cur, size-cur-1, field_width-cur, sf, ff,
|
|
|
|
digits, ef, tok->u.funcall.argv + ai,
|
|
|
|
NO_PRECEDENCE);
|
Make tpa the default file format for Teapot
There turned out to be one blocking technical issue for full adpotion of
tpa format, and that was the fact that the printed representation of
floating values inside the tpa file might not reproduce the same double
when read. This change therefore introduces the "hexact" floating point
format, based on the the %La format string, which produces a hex
representation with exact round trips. While working on this, it was
convenient to add a new representation "compact" which is basically the
shorter of decimal and scientific representations, without trailing zeros.
This is now the default float format, but of course one can select decimal
or scientific formats to restore prior appearance. However, full-precision
compact format is now the (only) format for editing cell contents, as it
is accurate and efficient. Of course you can enter floating point values
in any format you like when typing in a formula.
The addition of several new floating point options overloaded the menus
in terminal teapot, so this change also revamps those menus slightly,
including eliminating the unused MenuChoice struct, and just specifying menus
with an array of strings.
Closes #63.
2019-08-24 16:58:46 +00:00
|
|
|
}
|
|
|
|
if (cur < size) dest[cur++] = ')';
|
2019-08-24 22:17:35 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
case PREFIX_NEG: {
|
|
|
|
assert(tok->u.funcall.argc == 1);
|
|
|
|
assert(tfunc[fid].display_symbol != NULL);
|
|
|
|
if (fp < atprec && cur < size) dest[cur++] = '(';
|
|
|
|
if (cur < size) {
|
|
|
|
strncpy(dest+cur, tfunc[fid].display_symbol, size-cur-1);
|
|
|
|
cur += strlen(tfunc[fid].display_symbol);
|
|
|
|
}
|
|
|
|
cur += ptokatprec(dest+cur, size-cur-1, field_width-cur, sf, ff,
|
|
|
|
digits, ef, tok->u.funcall.argv, fp);
|
|
|
|
if (fp < atprec && cur < size) dest[cur++] = ')';
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
default: /* infix argument */
|
|
|
|
assert(tok->u.funcall.argc > 1);
|
|
|
|
if (fp < atprec && cur < size) dest[cur++] = '(';
|
2019-08-27 06:56:19 +00:00
|
|
|
/* Check for the special relation sequence notation */
|
|
|
|
bool specialrel = true;
|
|
|
|
if (fid != FUNC_AND || tok->u.funcall.argc < 2) specialrel = false;
|
|
|
|
else {
|
|
|
|
for (int ai = 0; ai < tok->u.funcall.argc; ++ai) {
|
|
|
|
if (tok->u.funcall.argv[ai].type != FUNCALL
|
|
|
|
|| tok->u.funcall.argv[ai].u.funcall.argc != 2
|
|
|
|
|| !IS_RELATION_FUNC(tok->u.funcall.argv[ai].u.funcall.fident))
|
|
|
|
{
|
|
|
|
specialrel = false;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
if (ai > 0
|
|
|
|
&& !tok_matches(tok->u.funcall.argv[ai].u.funcall.argv,
|
|
|
|
tok->u.funcall.argv[ai-1].u.funcall.argv+1))
|
|
|
|
{
|
|
|
|
specialrel = false;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (specialrel) {
|
|
|
|
cur += ptokatprec(dest+cur, size-cur-1, field_width-cur, sf, ff,
|
|
|
|
digits, ef, tok->u.funcall.argv, INFIX_BOOL);
|
|
|
|
for (int ai = 1; ai < tok->u.funcall.argc && cur < size-1; ++ ai) {
|
|
|
|
dest[cur++] = ' ';
|
|
|
|
const char *use =
|
|
|
|
tfunc[tok->u.funcall.argv[ai].u.funcall.fident].name;
|
2019-08-24 22:17:35 +00:00
|
|
|
strncpy(dest+cur, use, size-cur-1);
|
|
|
|
cur += strlen(use);
|
2019-08-27 06:56:19 +00:00
|
|
|
if (cur < size) dest[cur++] = ' ';
|
|
|
|
cur += ptokatprec(dest+cur, size-cur-1, field_width-cur, sf, ff,
|
|
|
|
digits, ef,
|
|
|
|
tok->u.funcall.argv[ai].u.funcall.argv + 1,
|
|
|
|
INFIX_REL);
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
for (int ai = 0; ai < tok->u.funcall.argc && cur < size-1; ++ai)
|
|
|
|
{
|
|
|
|
bool parenarg = false;
|
|
|
|
if (ai > 0) {
|
|
|
|
if (fp < INFIX_MUL && cur < size) dest[cur++] = ' ';
|
|
|
|
const char *use = tfunc[fid].display_symbol;
|
|
|
|
if (use == NULL) use = tfunc[fid].name;
|
|
|
|
strncpy(dest+cur, use, size-cur-1);
|
|
|
|
cur += strlen(use);
|
|
|
|
if (fp < INFIX_MUL && cur < size) dest[cur++] = ' ';
|
|
|
|
} else if (fp > PREFIX_NEG) {
|
|
|
|
char powbuf[4096];
|
|
|
|
size_t arglen = ptokatprec(powbuf, sizeof(powbuf), 0, sf, ff,
|
|
|
|
digits, ef, tok->u.funcall.argv, fp);
|
|
|
|
assert(arglen < sizeof(powbuf)-1);
|
|
|
|
if (powbuf[0] == '-') {
|
|
|
|
parenarg = true;
|
|
|
|
if (cur < size) dest[cur++] = '(';
|
|
|
|
}
|
2019-08-24 22:17:35 +00:00
|
|
|
}
|
2019-08-27 06:56:19 +00:00
|
|
|
cur += ptokatprec(dest+cur, size-cur-1, field_width-cur, sf, ff,
|
|
|
|
digits, ef, tok->u.funcall.argv + ai, fp);
|
|
|
|
if (parenarg && cur < size) dest[cur++] = ')';
|
2019-08-24 22:17:35 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
if (fp < atprec && cur < size) dest[cur++] = ')';
|
|
|
|
break;
|
Make tpa the default file format for Teapot
There turned out to be one blocking technical issue for full adpotion of
tpa format, and that was the fact that the printed representation of
floating values inside the tpa file might not reproduce the same double
when read. This change therefore introduces the "hexact" floating point
format, based on the the %La format string, which produces a hex
representation with exact round trips. While working on this, it was
convenient to add a new representation "compact" which is basically the
shorter of decimal and scientific representations, without trailing zeros.
This is now the default float format, but of course one can select decimal
or scientific formats to restore prior appearance. However, full-precision
compact format is now the (only) format for editing cell contents, as it
is accurate and efficient. Of course you can enter floating point values
in any format you like when typing in a formula.
The addition of several new floating point options overloaded the menus
in terminal teapot, so this change also revamps those menus slightly,
including eliminating the unused MenuChoice struct, and just specifying menus
with an array of strings.
Closes #63.
2019-08-24 16:58:46 +00:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
2019-08-27 06:56:19 +00:00
|
|
|
/* BOOL */ /*{{{*/
|
|
|
|
case BOOL:
|
|
|
|
{
|
|
|
|
const char *rep = "false";
|
|
|
|
if (tok->u.bl) rep = "true";
|
|
|
|
strncpy(dest+cur, rep, size-cur-1);
|
|
|
|
cur += strlen(rep);
|
|
|
|
break;
|
|
|
|
}
|
Make tpa the default file format for Teapot
There turned out to be one blocking technical issue for full adpotion of
tpa format, and that was the fact that the printed representation of
floating values inside the tpa file might not reproduce the same double
when read. This change therefore introduces the "hexact" floating point
format, based on the the %La format string, which produces a hex
representation with exact round trips. While working on this, it was
convenient to add a new representation "compact" which is basically the
shorter of decimal and scientific representations, without trailing zeros.
This is now the default float format, but of course one can select decimal
or scientific formats to restore prior appearance. However, full-precision
compact format is now the (only) format for editing cell contents, as it
is accurate and efficient. Of course you can enter floating point values
in any format you like when typing in a formula.
The addition of several new floating point options overloaded the menus
in terminal teapot, so this change also revamps those menus slightly,
including eliminating the unused MenuChoice struct, and just specifying menus
with an array of strings.
Closes #63.
2019-08-24 16:58:46 +00:00
|
|
|
/* EEK */ /*{{{*/
|
|
|
|
case EEK:
|
|
|
|
{
|
|
|
|
if (ef == RESTORE_ERROR) {
|
|
|
|
strncpy(dest + cur, "error(", size-cur-1);
|
|
|
|
cur += 6;
|
|
|
|
if (cur < size - 1)
|
|
|
|
cur += print_string(dest+cur, size-cur-1, tok->u.err, QUOTE_STRING);
|
|
|
|
if (cur < size - 1)
|
|
|
|
dest[cur++] = ')';
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
(void)strncpy(dest+cur, _("ERROR"), size-cur-1);
|
|
|
|
cur += strlen(_("ERROR"));
|
|
|
|
if (ef == VERBOSE_ERROR)
|
|
|
|
{
|
|
|
|
(void)strncpy(dest+cur, ": ", size-cur-1);
|
|
|
|
cur += 2;
|
|
|
|
size_t errlen = strlen(tok->u.err);
|
|
|
|
if ((cur+errlen+1) < size) strcpy(dest+cur, tok->u.err);
|
|
|
|
else (void)strncpy(dest+cur, tok->u.err, size-cur-1);
|
|
|
|
cur += errlen;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
/*}}}*/
|
|
|
|
/* default */ /*{{{*/
|
|
|
|
default: assert(0);
|
|
|
|
/*}}}*/
|
|
|
|
}
|
|
|
|
if (cur<size) dest[cur] = 0;
|
|
|
|
else
|
|
|
|
{
|
|
|
|
dest[size-1] = 0;
|
|
|
|
cur = size;
|
|
|
|
}
|
|
|
|
if (field_width && mbslen(dest) > field_width) {
|
|
|
|
for (cur = 0; cur < field_width; ++cur) dest[cur] = '#';
|
|
|
|
dest[cur] = 0;
|
|
|
|
}
|
|
|
|
return cur;
|
|
|
|
}
|
|
|
|
/*}}}*/
|
|
|
|
|
2019-08-24 22:17:35 +00:00
|
|
|
/* printtok -- print a single token, passed by address, although not changed */ /*{{{*/
|
|
|
|
size_t printtok(char* dest, size_t size, size_t field_width,
|
|
|
|
StringFormat sf, FloatFormat ff,
|
|
|
|
int digits, ErrorFormat ef, const Token *tok)
|
|
|
|
{
|
|
|
|
return ptokatprec(dest, size, field_width, sf, ff, digits, ef, tok,
|
|
|
|
NO_PRECEDENCE);
|
|
|
|
}
|
|
|
|
/*}}}*/
|
|
|
|
|
2019-08-27 06:56:19 +00:00
|
|
|
static char dbgpbuf[4096];
|
|
|
|
|
|
|
|
/* dbgprint -- simple on the fly print for in the debugger */
|
|
|
|
const char *dbgprint(const Token* tok) {
|
|
|
|
size_t used = printtok(dbgpbuf, sizeof(dbgpbuf), 0, QUOTE_STRING, FLT_COMPACT,
|
|
|
|
0, VERBOSE_ERROR, tok);
|
|
|
|
if (used > sizeof(dbgpbuf) - 2) {
|
|
|
|
printf(_("Warning: buffer overflow in dbgprint"));
|
|
|
|
}
|
|
|
|
return dbgpbuf;
|
|
|
|
}
|
|
|
|
|
Make tpa the default file format for Teapot
There turned out to be one blocking technical issue for full adpotion of
tpa format, and that was the fact that the printed representation of
floating values inside the tpa file might not reproduce the same double
when read. This change therefore introduces the "hexact" floating point
format, based on the the %La format string, which produces a hex
representation with exact round trips. While working on this, it was
convenient to add a new representation "compact" which is basically the
shorter of decimal and scientific representations, without trailing zeros.
This is now the default float format, but of course one can select decimal
or scientific formats to restore prior appearance. However, full-precision
compact format is now the (only) format for editing cell contents, as it
is accurate and efficient. Of course you can enter floating point values
in any format you like when typing in a formula.
The addition of several new floating point options overloaded the menus
in terminal teapot, so this change also revamps those menus slightly,
including eliminating the unused MenuChoice struct, and just specifying menus
with an array of strings.
Closes #63.
2019-08-24 16:58:46 +00:00
|
|
|
/* print -- print token sequence */ /*{{{*/
|
|
|
|
void print(char *s, size_t size, size_t chars, StringFormat sf, FloatFormat ff,
|
|
|
|
int digits, Token **n)
|
|
|
|
{
|
|
|
|
size_t cur;
|
|
|
|
|
|
|
|
cur=0;
|
|
|
|
if (n != EMPTY_TVEC)
|
|
|
|
for (; cur<size-1 && (*n) != NULLTOKEN; ++n)
|
|
|
|
cur += printtok(s+cur, size-cur, 0, sf, ff, digits, TRUNCATED_ERROR, *n);
|
|
|
|
if (cur<size) s[cur] = 0;
|
|
|
|
else s[size-1] = 0;
|
|
|
|
if (chars && mbslen(s) > chars) {
|
|
|
|
for (cur=0; cur < chars; ++cur) s[cur] = '#';
|
|
|
|
s[cur] = 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
/*}}}*/
|