[latex3-commits] [l3svn] r6780 - Replace most \c_minus_one by -\c_one (see #316)
noreply at latex-project.org
noreply at latex-project.org
Mon Dec 5 15:46:39 CET 2016
Author: bruno
Date: 2016-12-05 15:46:39 +0100 (Mon, 05 Dec 2016)
New Revision: 6780
Added:
trunk/l3kernel/testfiles/m3int001.luatex.tlg
trunk/l3kernel/testfiles/m3int001.uptex.tlg
Modified:
trunk/l3kernel/l3box.dtx
trunk/l3kernel/l3doc.dtx
trunk/l3kernel/l3file.dtx
trunk/l3kernel/l3fp-basics.dtx
trunk/l3kernel/l3fp-expo.dtx
trunk/l3kernel/l3fp-extended.dtx
trunk/l3kernel/l3fp-parse.dtx
trunk/l3kernel/l3fp-trig.dtx
trunk/l3kernel/l3int.dtx
trunk/l3kernel/l3msg.dtx
trunk/l3kernel/l3tl.dtx
trunk/l3kernel/testfiles/m3compare001.lvt
trunk/l3kernel/testfiles/m3expl001.luatex.tlg
trunk/l3kernel/testfiles/m3expl001.ptex.tlg
trunk/l3kernel/testfiles/m3expl001.tlg
trunk/l3kernel/testfiles/m3expl001.uptex.tlg
trunk/l3kernel/testfiles/m3expl001.xetex.tlg
trunk/l3kernel/testfiles/m3expl003.luatex.tlg
trunk/l3kernel/testfiles/m3expl003.ptex.tlg
trunk/l3kernel/testfiles/m3expl003.tlg
trunk/l3kernel/testfiles/m3expl003.uptex.tlg
trunk/l3kernel/testfiles/m3expl003.xetex.tlg
trunk/l3kernel/testfiles/m3fp-convert001.lvt
trunk/l3kernel/testfiles/m3fp-expo001.lvt
trunk/l3kernel/testfiles/m3fp-parse002.lvt
trunk/l3kernel/testfiles/m3int001.tlg
trunk/l3kernel/testfiles/m3int001.xetex.tlg
trunk/l3kernel/testfiles/m3int002.luatex.tlg
trunk/l3kernel/testfiles/m3int002.lvt
trunk/l3kernel/testfiles/m3int002.tlg
trunk/l3kernel/testfiles/m3int002.uptex.tlg
trunk/l3kernel/testfiles/m3int002.xetex.tlg
trunk/l3trial/l3bigint/l3bigint.dtx
trunk/l3trial/xfont/build.lua
trunk/l3trial/xfont/xfss.dtx
Log:
Replace most \c_minus_one by -\c_one (see #316)
In a few places \c_minus_one was used in \if_case:w to point to
the \else: branch so I replaced it by \c_four (large enough).
The m3int01 test file changes because it probes error recovery
of \int_decr:N, changed. The remaining changes will allocate
counters and shift register numbers in test files: next commit.
Modified: trunk/l3kernel/l3box.dtx
===================================================================
--- trunk/l3kernel/l3box.dtx 2016-12-05 14:38:24 UTC (rev 6779)
+++ trunk/l3kernel/l3box.dtx 2016-12-05 14:46:39 UTC (rev 6780)
@@ -976,7 +976,7 @@
\int_set:Nn \tex_showboxbreadth:D {#3}
\int_set:Nn \tex_showboxdepth:D {#4}
\int_set_eq:NN \tex_tracingonline:D #1
- \int_set_eq:NN \tex_errorcontextlines:D \c_minus_one
+ \int_set:Nn \tex_errorcontextlines:D { - \c_one }
\box_if_exist:NTF #2
{ \tex_showbox:D \use:n {#2} }
{
Modified: trunk/l3kernel/l3doc.dtx
===================================================================
--- trunk/l3kernel/l3doc.dtx 2016-12-05 14:38:24 UTC (rev 6779)
+++ trunk/l3kernel/l3doc.dtx 2016-12-05 14:46:39 UTC (rev 6780)
@@ -4322,7 +4322,6 @@
%
% \begin{macro}
% {
-% \c_minus_one,
% \c_zero,
% \c_one,
% \c_two,
Modified: trunk/l3kernel/l3file.dtx
===================================================================
--- trunk/l3kernel/l3file.dtx 2016-12-05 14:38:24 UTC (rev 6779)
+++ trunk/l3kernel/l3file.dtx 2016-12-05 14:46:39 UTC (rev 6780)
@@ -1110,7 +1110,7 @@
% \begin{macrocode}
\cs_new_protected:Npn \ior_close:N #1
{
- \int_compare:nT { \c_minus_one < #1 < \c_sixteen }
+ \int_compare:nT { - \c_one < #1 < \c_sixteen }
{
\tex_closein:D #1
\prop_gremove:NV \g_@@_streams_prop #1
@@ -1194,7 +1194,7 @@
{
\use:x
{
- \int_set_eq:NN \tex_endlinechar:D \c_minus_one
+ \int_set:Nn \tex_endlinechar:D { - \c_one }
\exp_not:n { \etex_readline:D #1 to #2 }
\int_set:Nn \tex_endlinechar:D { \int_use:N \tex_endlinechar:D }
}
@@ -1349,7 +1349,7 @@
% \begin{macrocode}
\cs_new_protected:Npn \iow_close:N #1
{
- \int_compare:nT { \c_minus_one < #1 < \c_sixteen }
+ \int_compare:nT { - \c_one < #1 < \c_sixteen }
{
\tex_immediate:D \tex_closeout:D #1
\prop_gremove:NV \g_@@_streams_prop #1
@@ -1572,7 +1572,7 @@
% nicer.
% \begin{macrocode}
\group_begin:
- \int_set_eq:NN \tex_escapechar:D \c_minus_one
+ \int_set:Nn \tex_escapechar:D { - \c_one }
\tl_const:Nx \c_@@_wrap_marker_tl
{ \tl_to_str:n { \^^I \^^O \^^W \^^_ \^^W \^^R \^^A \^^P } }
\group_end:
@@ -1638,7 +1638,7 @@
\cs_new_protected:Npn \iow_wrap:nnnN #1#2#3#4
{
\group_begin:
- \int_set_eq:NN \tex_escapechar:D \c_minus_one
+ \int_set:Nn \tex_escapechar:D { - \c_one }
\cs_set:Npx \{ { \token_to_str:N \{ }
\cs_set:Npx \# { \token_to_str:N \# }
\cs_set:Npx \} { \token_to_str:N \} }
Modified: trunk/l3kernel/l3fp-basics.dtx
===================================================================
--- trunk/l3kernel/l3fp-basics.dtx 2016-12-05 14:38:24 UTC (rev 6779)
+++ trunk/l3kernel/l3fp-basics.dtx 2016-12-05 14:46:39 UTC (rev 6780)
@@ -215,7 +215,7 @@
\if_int_compare:w #2 > #4 \exp_stop_f:
\c_three
\else:
- \c_minus_one
+ \c_four
\fi:
\fi:
\exp_after:wN \@@_add_zeros_o:Nww \__int_value:w
Modified: trunk/l3kernel/l3fp-expo.dtx
===================================================================
--- trunk/l3kernel/l3fp-expo.dtx 2016-12-05 14:38:24 UTC (rev 6779)
+++ trunk/l3kernel/l3fp-expo.dtx 2016-12-05 14:46:39 UTC (rev 6780)
@@ -1208,12 +1208,12 @@
% \meta{digits} |;| which would be the digits surrounding the decimal
% period. If the \meta{digits} are non-zero, the number is not an
% integer. Otherwise, check the parity of the \meta{digit} and return
-% \cs{c_zero} or \cs{c_minus_one}.
+% \cs{c_zero} or |-|\cs{c_one}.
% \begin{macrocode}
\cs_new:Npn \@@_pow_neg_case:w \s_@@ \@@_chk:w #1#2#3;
{
\if_case:w #1 \exp_stop_f:
- \c_minus_one
+ -\c_one
\or: \@@_pow_neg_case_aux:nnnnn #3
\else: \c_one
\fi:
@@ -1222,7 +1222,7 @@
{
\if_int_compare:w #1 > \c_eight
\if_int_compare:w #1 > \c_sixteen
- \c_minus_one
+ -\c_one
\else:
\exp_after:wN \exp_after:wN
\exp_after:wN \@@_pow_neg_case_aux:NNNNNNNNw
@@ -1248,7 +1248,7 @@
\if_int_odd:w #8 \exp_stop_f:
\c_zero
\else:
- \c_minus_one
+ -\c_one
\fi:
\else:
\c_one
Modified: trunk/l3kernel/l3fp-extended.dtx
===================================================================
--- trunk/l3kernel/l3fp-extended.dtx 2016-12-05 14:38:24 UTC (rev 6779)
+++ trunk/l3kernel/l3fp-extended.dtx 2016-12-05 14:46:39 UTC (rev 6780)
@@ -290,7 +290,7 @@
{
\exp_after:wN \@@_fixed_div_int_after:Nw
\exp_after:wN #8
- \__int_value:w \__int_eval:w \c_minus_one
+ \__int_value:w \__int_eval:w - \c_one
\@@_fixed_div_int:wnN
#1; {#7} \@@_fixed_div_int_auxi:wnn
#2; {#7} \@@_fixed_div_int_auxi:wnn
Modified: trunk/l3kernel/l3fp-parse.dtx
===================================================================
--- trunk/l3kernel/l3fp-parse.dtx 2016-12-05 14:38:24 UTC (rev 6779)
+++ trunk/l3kernel/l3fp-parse.dtx 2016-12-05 14:46:39 UTC (rev 6780)
@@ -125,6 +125,12 @@
% \item[-1] Start and end of the expression.
% \end{itemize}
%
+% \begin{variable}{\c_@@_prec_end_int}
+% \begin{macrocode}
+\cs_new_eq:NN \c_@@_prec_end_int \c_minus_one
+% \end{macrocode}
+% \end{variable}
+%
% \subsubsection{Storing results}
%
% The main question in parsing expressions expandably is to decide where
@@ -2091,7 +2097,7 @@
% Start an \cs{exp:w} expansion so that \cs{@@_parse:n} expands
% in two steps. The \cs{@@_parse_operand:Nw} function will perform
% computations until reaching an operation with precedence
-% \cs{c_minus_one} or less, namely, the end of the expression. The
+% \cs{c_@@_prec_end_int} or less, namely, the end of the expression. The
% marker \cs{s_@@_mark} indicates that the next token is an already
% parsed version of an infix operator, and \cs{@@_parse_infix_end:N}
% has infinitely negative precedence. Finally, clean up a
@@ -2103,7 +2109,7 @@
\exp:w
\exp_after:wN \@@_parse_after:ww
\exp:w
- \@@_parse_operand:Nw \c_minus_one
+ \@@_parse_operand:Nw \c_@@_prec_end_int
\@@_parse_expand:w #1
\s_@@_mark \@@_parse_infix_end:N
\s_@@_stop
@@ -2586,7 +2592,7 @@
{
\if_case:w
\if_catcode:w \scan_stop: \exp_not:N #7
- \c_minus_one
+ \c_four
\else:
\__int_eval:w `#7 - `< \__int_eval_end:
\fi:
Modified: trunk/l3kernel/l3fp-trig.dtx
===================================================================
--- trunk/l3kernel/l3fp-trig.dtx 2016-12-05 14:38:24 UTC (rev 6779)
+++ trunk/l3kernel/l3fp-trig.dtx 2016-12-05 14:46:39 UTC (rev 6780)
@@ -1272,7 +1272,7 @@
% \begin{macrocode}
\cs_new:Npn \@@_atan_Taylor_loop:www #1; #2; #3;
{
- \if_int_compare:w #1 = \c_minus_one
+ \if_int_compare:w #1 = - \c_one
\@@_atan_Taylor_break:w
\fi:
\exp_after:wN \@@_fixed_div_int:wwN \c_@@_one_fixed_tl ; #1;
Modified: trunk/l3kernel/l3int.dtx
===================================================================
--- trunk/l3kernel/l3int.dtx 2016-12-05 14:38:24 UTC (rev 6779)
+++ trunk/l3kernel/l3int.dtx 2016-12-05 14:46:39 UTC (rev 6780)
@@ -1313,7 +1313,7 @@
\cs_new_protected:Npn \int_incr:N #1
{ \tex_advance:D #1 \c_one }
\cs_new_protected:Npn \int_decr:N #1
- { \tex_advance:D #1 \c_minus_one }
+ { \tex_advance:D #1 - \c_one }
\cs_new_protected:Npn \int_gincr:N
{ \tex_global:D \int_incr:N }
\cs_new_protected:Npn \int_gdecr:N
Modified: trunk/l3kernel/l3msg.dtx
===================================================================
--- trunk/l3kernel/l3msg.dtx 2016-12-05 14:38:24 UTC (rev 6779)
+++ trunk/l3kernel/l3msg.dtx 2016-12-05 14:46:39 UTC (rev 6780)
@@ -1074,7 +1074,7 @@
}
\__iow_with:Nnn \tex_newlinechar:D { `\^^J }
{
- \__iow_with:Nnn \tex_errorcontextlines:D \c_minus_one
+ \__iow_with:Nnn \tex_errorcontextlines:D { - \c_one }
{
\group_begin:
\cs_set_protected:Npn &
@@ -1124,7 +1124,7 @@
% deliberate change by a user this is only set in format mode.
% \begin{macrocode}
%<*initex>
-\int_gset_eq:NN \tex_errorcontextlines:D \c_minus_one
+\int_gset:Nn \tex_errorcontextlines:D { - \c_one }
%</initex>
% \end{macrocode}
%
@@ -2256,7 +2256,7 @@
{
\__iow_with:Nnn \tex_newlinechar:D { 10 }
{
- \__iow_with:Nnn \tex_errorcontextlines:D \c_minus_one
+ \__iow_with:Nnn \tex_errorcontextlines:D { - \c_one }
{
\etex_showtokens:D \exp_after:wN \exp_after:wN \exp_after:wN
{ \exp_after:wN \l_@@_internal_tl }
Modified: trunk/l3kernel/l3tl.dtx
===================================================================
--- trunk/l3kernel/l3tl.dtx 2016-12-05 14:38:24 UTC (rev 6779)
+++ trunk/l3kernel/l3tl.dtx 2016-12-05 14:46:39 UTC (rev 6780)
@@ -1457,7 +1457,7 @@
\group_begin:
\exp_args:No \etex_everyeof:D { \c_@@_rescan_marker_tl \exp_not:N }
\int_compare:nNnT \tex_endlinechar:D = { 32 }
- { \tex_endlinechar:D \c_minus_one }
+ { \tex_endlinechar:D - \c_one }
\tex_newlinechar:D \tex_endlinechar:D
#3 \scan_stop:
\exp_args:No \@@_set_rescan:n { \tl_to_str:n {#4} }
@@ -1582,7 +1582,7 @@
}
\cs_new_protected:Npn \@@_set_rescan_single_aux:nn #1#2
{
- \tex_endlinechar:D \c_minus_one
+ \tex_endlinechar:D - \c_one
\use:x
{
\exp_not:N \use:n
Modified: trunk/l3kernel/testfiles/m3compare001.lvt
===================================================================
--- trunk/l3kernel/testfiles/m3compare001.lvt 2016-12-05 14:38:24 UTC (rev 6779)
+++ trunk/l3kernel/testfiles/m3compare001.lvt 2016-12-05 14:46:39 UTC (rev 6780)
@@ -59,7 +59,7 @@
\test:nn { -01 } { - 3 + 2 }
\test:nn { 1 } { 2 }
\test:nn { -1 } { -2 }
- \test:nn { -2 + -12 } { \c_minus_one * \c_three }
+ \test:nn { -2 + -12 } { -\c_one * \c_three }
}
\TESTEXP { Erroneous~integer~comparisons }
Modified: trunk/l3kernel/testfiles/m3expl001.luatex.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3expl001.luatex.tlg 2016-12-05 14:38:24 UTC (rev 6779)
+++ trunk/l3kernel/testfiles/m3expl001.luatex.tlg 2016-12-05 14:46:39 UTC (rev 6780)
@@ -3519,6 +3519,7 @@
Defining \__fp_round_normal_end:wwNnn on line ...
Defining \__fp_round_special:NwwNnn on line ...
Defining \__fp_round_special_aux:Nw on line ...
+Defining \c__fp_prec_end_int on line ...
Defining \__fp_parse_expand:w on line ...
Defining \__fp_parse_return_semicolon:w on line ...
Defining \__fp_type_from_scan:N on line ...
Modified: trunk/l3kernel/testfiles/m3expl001.ptex.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3expl001.ptex.tlg 2016-12-05 14:38:24 UTC (rev 6779)
+++ trunk/l3kernel/testfiles/m3expl001.ptex.tlg 2016-12-05 14:46:39 UTC (rev 6780)
@@ -3510,6 +3510,7 @@
Defining \__fp_round_normal_end:wwNnn on line ...
Defining \__fp_round_special:NwwNnn on line ...
Defining \__fp_round_special_aux:Nw on line ...
+Defining \c__fp_prec_end_int on line ...
Defining \__fp_parse_expand:w on line ...
Defining \__fp_parse_return_semicolon:w on line ...
Defining \__fp_type_from_scan:N on line ...
Modified: trunk/l3kernel/testfiles/m3expl001.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3expl001.tlg 2016-12-05 14:38:24 UTC (rev 6779)
+++ trunk/l3kernel/testfiles/m3expl001.tlg 2016-12-05 14:46:39 UTC (rev 6780)
@@ -3510,6 +3510,7 @@
Defining \__fp_round_normal_end:wwNnn on line ...
Defining \__fp_round_special:NwwNnn on line ...
Defining \__fp_round_special_aux:Nw on line ...
+Defining \c__fp_prec_end_int on line ...
Defining \__fp_parse_expand:w on line ...
Defining \__fp_parse_return_semicolon:w on line ...
Defining \__fp_type_from_scan:N on line ...
Modified: trunk/l3kernel/testfiles/m3expl001.uptex.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3expl001.uptex.tlg 2016-12-05 14:38:24 UTC (rev 6779)
+++ trunk/l3kernel/testfiles/m3expl001.uptex.tlg 2016-12-05 14:46:39 UTC (rev 6780)
@@ -3510,6 +3510,7 @@
Defining \__fp_round_normal_end:wwNnn on line ...
Defining \__fp_round_special:NwwNnn on line ...
Defining \__fp_round_special_aux:Nw on line ...
+Defining \c__fp_prec_end_int on line ...
Defining \__fp_parse_expand:w on line ...
Defining \__fp_parse_return_semicolon:w on line ...
Defining \__fp_type_from_scan:N on line ...
Modified: trunk/l3kernel/testfiles/m3expl001.xetex.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3expl001.xetex.tlg 2016-12-05 14:38:24 UTC (rev 6779)
+++ trunk/l3kernel/testfiles/m3expl001.xetex.tlg 2016-12-05 14:46:39 UTC (rev 6780)
@@ -3517,6 +3517,7 @@
Defining \__fp_round_normal_end:wwNnn on line ...
Defining \__fp_round_special:NwwNnn on line ...
Defining \__fp_round_special_aux:Nw on line ...
+Defining \c__fp_prec_end_int on line ...
Defining \__fp_parse_expand:w on line ...
Defining \__fp_parse_return_semicolon:w on line ...
Defining \__fp_type_from_scan:N on line ...
Modified: trunk/l3kernel/testfiles/m3expl003.luatex.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3expl003.luatex.tlg 2016-12-05 14:38:24 UTC (rev 6779)
+++ trunk/l3kernel/testfiles/m3expl003.luatex.tlg 2016-12-05 14:46:39 UTC (rev 6780)
@@ -3520,6 +3520,7 @@
Defining \__fp_round_normal_end:wwNnn on line ...
Defining \__fp_round_special:NwwNnn on line ...
Defining \__fp_round_special_aux:Nw on line ...
+Defining \c__fp_prec_end_int on line ...
Defining \__fp_parse_expand:w on line ...
Defining \__fp_parse_return_semicolon:w on line ...
Defining \__fp_type_from_scan:N on line ...
Modified: trunk/l3kernel/testfiles/m3expl003.ptex.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3expl003.ptex.tlg 2016-12-05 14:38:24 UTC (rev 6779)
+++ trunk/l3kernel/testfiles/m3expl003.ptex.tlg 2016-12-05 14:46:39 UTC (rev 6780)
@@ -3511,6 +3511,7 @@
Defining \__fp_round_normal_end:wwNnn on line ...
Defining \__fp_round_special:NwwNnn on line ...
Defining \__fp_round_special_aux:Nw on line ...
+Defining \c__fp_prec_end_int on line ...
Defining \__fp_parse_expand:w on line ...
Defining \__fp_parse_return_semicolon:w on line ...
Defining \__fp_type_from_scan:N on line ...
Modified: trunk/l3kernel/testfiles/m3expl003.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3expl003.tlg 2016-12-05 14:38:24 UTC (rev 6779)
+++ trunk/l3kernel/testfiles/m3expl003.tlg 2016-12-05 14:46:39 UTC (rev 6780)
@@ -3511,6 +3511,7 @@
Defining \__fp_round_normal_end:wwNnn on line ...
Defining \__fp_round_special:NwwNnn on line ...
Defining \__fp_round_special_aux:Nw on line ...
+Defining \c__fp_prec_end_int on line ...
Defining \__fp_parse_expand:w on line ...
Defining \__fp_parse_return_semicolon:w on line ...
Defining \__fp_type_from_scan:N on line ...
Modified: trunk/l3kernel/testfiles/m3expl003.uptex.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3expl003.uptex.tlg 2016-12-05 14:38:24 UTC (rev 6779)
+++ trunk/l3kernel/testfiles/m3expl003.uptex.tlg 2016-12-05 14:46:39 UTC (rev 6780)
@@ -3511,6 +3511,7 @@
Defining \__fp_round_normal_end:wwNnn on line ...
Defining \__fp_round_special:NwwNnn on line ...
Defining \__fp_round_special_aux:Nw on line ...
+Defining \c__fp_prec_end_int on line ...
Defining \__fp_parse_expand:w on line ...
Defining \__fp_parse_return_semicolon:w on line ...
Defining \__fp_type_from_scan:N on line ...
Modified: trunk/l3kernel/testfiles/m3expl003.xetex.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3expl003.xetex.tlg 2016-12-05 14:38:24 UTC (rev 6779)
+++ trunk/l3kernel/testfiles/m3expl003.xetex.tlg 2016-12-05 14:46:39 UTC (rev 6780)
@@ -3518,6 +3518,7 @@
Defining \__fp_round_normal_end:wwNnn on line ...
Defining \__fp_round_special:NwwNnn on line ...
Defining \__fp_round_special_aux:Nw on line ...
+Defining \c__fp_prec_end_int on line ...
Defining \__fp_parse_expand:w on line ...
Defining \__fp_parse_return_semicolon:w on line ...
Defining \__fp_type_from_scan:N on line ...
Modified: trunk/l3kernel/testfiles/m3fp-convert001.lvt
===================================================================
--- trunk/l3kernel/testfiles/m3fp-convert001.lvt 2016-12-05 14:38:24 UTC (rev 6779)
+++ trunk/l3kernel/testfiles/m3fp-convert001.lvt 2016-12-05 14:46:39 UTC (rev 6780)
@@ -84,7 +84,7 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\TESTEXP{Unpacking}{
- \fp_to_tl:n {\c_twelve e\c_minus_one} \NEWLINE
+ \fp_to_tl:n {\c_twelve e-\c_one} \NEWLINE
}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
Modified: trunk/l3kernel/testfiles/m3fp-expo001.lvt
===================================================================
--- trunk/l3kernel/testfiles/m3fp-expo001.lvt 2016-12-05 14:38:24 UTC (rev 6779)
+++ trunk/l3kernel/testfiles/m3fp-expo001.lvt 2016-12-05 14:46:39 UTC (rev 6780)
@@ -126,11 +126,12 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\OMIT
\fp_set:Nn \l_A_fp { -1 }
+\int_const:Nn \c_test_minus_one_int { -1 }
\TIMO
\TESTEXP { Power~and~minus~one }
{
\fp_to_tl:n { -1**2 - \l_A_fp **2 } \NEWLINE
- \fp_to_tl:n { \c_minus_one **2 } \NEWLINE
+ \fp_to_tl:n { \c_test_minus_one_int **2 } \NEWLINE
}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
Modified: trunk/l3kernel/testfiles/m3fp-parse002.lvt
===================================================================
--- trunk/l3kernel/testfiles/m3fp-parse002.lvt 2016-12-05 14:38:24 UTC (rev 6779)
+++ trunk/l3kernel/testfiles/m3fp-parse002.lvt 2016-12-05 14:46:39 UTC (rev 6780)
@@ -26,7 +26,7 @@
\TESTEXP { Expansion }
{
- \fp_eval:n { \1\2\3{\4}\.\+\2 * \c_two\*\use:n{\*}\c_three e\c_minus_one }
+ \fp_eval:n { \1\2\3{\4}\.\+\2 * \c_two\*\use:n{\*}\c_three e-\c_one }
\NEWLINE
\fp_eval:n { \X * \2 \X - ( \X ** \3 ) \X } \NEWLINE
\fp_eval:n { \X * \relax && 2 } \NEWLINE
Added: trunk/l3kernel/testfiles/m3int001.luatex.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3int001.luatex.tlg (rev 0)
+++ trunk/l3kernel/testfiles/m3int001.luatex.tlg 2016-12-05 14:46:39 UTC (rev 6780)
@@ -0,0 +1,161 @@
+This is a generated file for the LaTeX (2e + expl3) validation system.
+Don't change this file in any respect.
+Author: Frank Mittelbach
+============================================================
+TEST 1: allocating new registers; no worries
+============================================================
+Defining \l_testa_int on line ...
+\l_testa_int=\count134
+Defining \g_testa_int on line ...
+\g_testa_int=\count135
+Defining \g_testb_int on line ...
+\g_testb_int=\count136
+============================================================
+============================================================
+TEST 2: allocating same name: errors expected
+============================================================
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!
+! LaTeX error: "kernel/command-already-defined"
+!
+! Control sequence \l_testa_int already defined.
+!
+! See the LaTeX3 documentation for further information.
+!
+! For immediate help type H <return>.
+!...............................................
+l. ... }
+|'''''''''''''''''''''''''''''''''''''''''''''''
+| This is a coding error.
+|
+| LaTeX has been asked to create a new control sequence '\l_testa_int' but
+| this name has already been used elsewhere.
+|
+| The current meaning is:
+| \count134
+|...............................................
+Defining \l_testa_int on line ...
+\l_testa_int=\count137
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!
+! LaTeX error: "kernel/command-already-defined"
+!
+! Control sequence \g_testa_int already defined.
+!
+! See the LaTeX3 documentation for further information.
+!
+! For immediate help type H <return>.
+!...............................................
+l. ... }
+|'''''''''''''''''''''''''''''''''''''''''''''''
+| This is a coding error.
+|
+| LaTeX has been asked to create a new control sequence '\g_testa_int' but
+| this name has already been used elsewhere.
+|
+| The current meaning is:
+| \count135
+|...............................................
+Defining \g_testa_int on line ...
+\g_testa_int=\count138
+============================================================
+============================================================
+TEST 3: allocate or clear
+============================================================
+Defining \l_testb_int on line ...
+\l_testb_int=\count139
+0
+0
+0
+0
+10
+0
+0
+0
+============================================================
+============================================================
+TEST 4: incrementing and decrementing: expect 3, -1
+============================================================
+3
+-1
+============================================================
+============================================================
+TEST 5: generating overflow: expect 2147483647, -2147483648, 2147483647
+============================================================
+2147483647
+-2147483648
+2147483647
+============================================================
+============================================================
+TEST 6: incrementing and decrementing: expect -2
+============================================================
+-2
+============================================================
+============================================================
+TEST 7: trying invalid variables: expect errors
+============================================================
+! You can't use `the character -' after \advance.
+\int_decr:N #1->\tex_advance:D #1-
+ \c_one
+l. ... }
+I'm forgetting what you said and not changing anything.
+============================================================
+============================================================
+TEST 8: using num expr
+============================================================
+185
+-30
+24
+-30
+! Arithmetic overflow.
+\int_set:Nn ...1 \__int_eval:w #2\__int_eval_end:
+l. ... }
+I can't evaluate this expression,
+since the result is out of range.
+0
+============================================================
+============================================================
+TEST 9: adding and subtracting
+============================================================
+50
+35
+6
+-19
+============================================================
+============================================================
+TEST 10: converting numbers: 3 i L ix XXI
+============================================================
+3 i L ix XXI
+============================================================
+============================================================
+TEST 11: converting numbers: expect !! !! !! !a!
+============================================================
+!! !! !! !a!
+============================================================
+============================================================
+TEST 12: converting numbers: expect !! !! !! !i!
+============================================================
+!! !! !! !i!
+============================================================
+============================================================
+TEST 13: converting numbers (huge values)
+============================================================
+fxshrxw
+============================================================
+============================================================
+TEST 14: evaluating integer expressions: 10 NO NO YES YES YES
+============================================================
+10 NO NO YES YES YES
+============================================================
+============================================================
+TEST 15: converting from and to base: expect 21 17
+============================================================
+21 17
+============================================================
+============================================================
+TEST 16: Case statements
+============================================================
+YES
+YES
+YES
+============================================================
Property changes on: trunk/l3kernel/testfiles/m3int001.luatex.tlg
___________________________________________________________________
Added: svn:eol-style
+ native
Modified: trunk/l3kernel/testfiles/m3int001.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3int001.tlg 2016-12-05 14:38:24 UTC (rev 6779)
+++ trunk/l3kernel/testfiles/m3int001.tlg 2016-12-05 14:46:39 UTC (rev 6780)
@@ -94,13 +94,30 @@
============================================================
TEST 7: trying invalid variables: expect errors
============================================================
-! Missing number, treated as zero.
-<to be read again>
- \endgroup
+! You can't use `the character -' after \advance.
+\int_decr:N #1->\tex_advance:D #1-
+ \c_one
l. ... }
-A number should have been here; I inserted `0'.
-(If you can't figure out why I needed to see a number,
-look up `weird error' in the index to The TeXbook.)
+I'm forgetting what you said and not changing anything.
+! Missing $ inserted.
+<inserted text>
+ $
+l. ... }
+I've inserted a begin-math/end-math symbol since I think
+you left one out. Proceed, with fingers crossed.
+LaTeX Font Info: External font `cmex10' loaded for size
+(Font) <7> on input line ....
+LaTeX Font Info: External font `cmex10' loaded for size
+(Font) <5> on input line ....
+! Missing $ inserted.
+<inserted text>
+ $
+l. ... }
+I've inserted something that you may have forgotten.
+(See the <inserted text> above.)
+With luck, this will get me unwedged. But if you
+really didn't forget anything, try typing `2' now; then
+my insertion and my current dilemma will both disappear.
============================================================
============================================================
TEST 8: using num expr
Added: trunk/l3kernel/testfiles/m3int001.uptex.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3int001.uptex.tlg (rev 0)
+++ trunk/l3kernel/testfiles/m3int001.uptex.tlg 2016-12-05 14:46:39 UTC (rev 6780)
@@ -0,0 +1,161 @@
+This is a generated file for the LaTeX (2e + expl3) validation system.
+Don't change this file in any respect.
+Author: Frank Mittelbach
+============================================================
+TEST 1: allocating new registers; no worries
+============================================================
+Defining \l_testa_int on line ...
+\l_testa_int=\count134
+Defining \g_testa_int on line ...
+\g_testa_int=\count135
+Defining \g_testb_int on line ...
+\g_testb_int=\count136
+============================================================
+============================================================
+TEST 2: allocating same name: errors expected
+============================================================
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!
+! LaTeX error: "kernel/command-already-defined"
+!
+! Control sequence \l_testa_int already defined.
+!
+! See the LaTeX3 documentation for further information.
+!
+! For immediate help type H <return>.
+!...............................................
+l. ... }
+|'''''''''''''''''''''''''''''''''''''''''''''''
+| This is a coding error.
+|
+| LaTeX has been asked to create a new control sequence '\l_testa_int' but
+| this name has already been used elsewhere.
+|
+| The current meaning is:
+| \count134
+|...............................................
+Defining \l_testa_int on line ...
+\l_testa_int=\count137
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!
+! LaTeX error: "kernel/command-already-defined"
+!
+! Control sequence \g_testa_int already defined.
+!
+! See the LaTeX3 documentation for further information.
+!
+! For immediate help type H <return>.
+!...............................................
+l. ... }
+|'''''''''''''''''''''''''''''''''''''''''''''''
+| This is a coding error.
+|
+| LaTeX has been asked to create a new control sequence '\g_testa_int' but
+| this name has already been used elsewhere.
+|
+| The current meaning is:
+| \count135
+|...............................................
+Defining \g_testa_int on line ...
+\g_testa_int=\count138
+============================================================
+============================================================
+TEST 3: allocate or clear
+============================================================
+Defining \l_testb_int on line ...
+\l_testb_int=\count139
+0
+0
+0
+0
+10
+0
+0
+0
+============================================================
+============================================================
+TEST 4: incrementing and decrementing: expect 3, -1
+============================================================
+3
+-1
+============================================================
+============================================================
+TEST 5: generating overflow: expect 2147483647, -2147483648, 2147483647
+============================================================
+2147483647
+-2147483648
+2147483647
+============================================================
+============================================================
+TEST 6: incrementing and decrementing: expect -2
+============================================================
+-2
+============================================================
+============================================================
+TEST 7: trying invalid variables: expect errors
+============================================================
+! You can't use `the character -' after \advance.
+\int_decr:N #1->\tex_advance:D #1-
+ \c_one
+l. ... }
+I'm forgetting what you said and not changing anything.
+============================================================
+============================================================
+TEST 8: using num expr
+============================================================
+185
+-30
+24
+-30
+! Arithmetic overflow.
+\int_set:Nn ...1 \__int_eval:w #2\__int_eval_end:
+l. ... }
+I can't evaluate this expression,
+since the result is out of range.
+0
+============================================================
+============================================================
+TEST 9: adding and subtracting
+============================================================
+50
+35
+6
+-19
+============================================================
+============================================================
+TEST 10: converting numbers: 3 i L ix XXI
+============================================================
+3 i L ix XXI
+============================================================
+============================================================
+TEST 11: converting numbers: expect !! !! !! !a!
+============================================================
+!! !! !! !a!
+============================================================
+============================================================
+TEST 12: converting numbers: expect !! !! !! !i!
+============================================================
+!! !! !! !i!
+============================================================
+============================================================
+TEST 13: converting numbers (huge values)
+============================================================
+fxshrxw
+============================================================
+============================================================
+TEST 14: evaluating integer expressions: 10 NO NO YES YES YES
+============================================================
+10 NO NO YES YES YES
+============================================================
+============================================================
+TEST 15: converting from and to base: expect 21 17
+============================================================
+21 17
+============================================================
+============================================================
+TEST 16: Case statements
+============================================================
+YES
+YES
+YES
+============================================================
Property changes on: trunk/l3kernel/testfiles/m3int001.uptex.tlg
___________________________________________________________________
Added: svn:eol-style
+ native
Modified: trunk/l3kernel/testfiles/m3int001.xetex.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3int001.xetex.tlg 2016-12-05 14:38:24 UTC (rev 6779)
+++ trunk/l3kernel/testfiles/m3int001.xetex.tlg 2016-12-05 14:46:39 UTC (rev 6780)
@@ -94,13 +94,11 @@
============================================================
TEST 7: trying invalid variables: expect errors
============================================================
-! Missing number, treated as zero.
-<to be read again>
- \endgroup
+! You can't use `the character -' after \advance.
+\int_decr:N #1->\tex_advance:D #1-
+ \c_one
l. ... }
-A number should have been here; I inserted `0'.
-(If you can't figure out why I needed to see a number,
-look up `weird error' in the index to The TeXbook.)
+I'm forgetting what you said and not changing anything.
============================================================
============================================================
TEST 8: using num expr
Modified: trunk/l3kernel/testfiles/m3int002.luatex.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3int002.luatex.tlg 2016-12-05 14:38:24 UTC (rev 6779)
+++ trunk/l3kernel/testfiles/m3int002.luatex.tlg 2016-12-05 14:46:39 UTC (rev 6780)
@@ -655,7 +655,6 @@
============================================================
TEST 49: Internal integer constants
============================================================
--1
0
1
2
Modified: trunk/l3kernel/testfiles/m3int002.lvt
===================================================================
--- trunk/l3kernel/testfiles/m3int002.lvt 2016-12-05 14:38:24 UTC (rev 6779)
+++ trunk/l3kernel/testfiles/m3int002.lvt 2016-12-05 14:46:39 UTC (rev 6780)
@@ -787,10 +787,10 @@
\TYPE { \int_use:N \c_max_int }
}
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\TEST { Internal~integer~constants } {
- \TYPE { \int_use:N \c_minus_one }
\TYPE { \int_use:N \c_zero }
\TYPE { \int_use:N \c_one }
\TYPE { \int_use:N \c_two }
Modified: trunk/l3kernel/testfiles/m3int002.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3int002.tlg 2016-12-05 14:38:24 UTC (rev 6779)
+++ trunk/l3kernel/testfiles/m3int002.tlg 2016-12-05 14:46:39 UTC (rev 6780)
@@ -655,7 +655,6 @@
============================================================
TEST 49: Internal integer constants
============================================================
--1
0
1
2
Modified: trunk/l3kernel/testfiles/m3int002.uptex.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3int002.uptex.tlg 2016-12-05 14:38:24 UTC (rev 6779)
+++ trunk/l3kernel/testfiles/m3int002.uptex.tlg 2016-12-05 14:46:39 UTC (rev 6780)
@@ -655,7 +655,6 @@
============================================================
TEST 49: Internal integer constants
============================================================
--1
0
1
2
Modified: trunk/l3kernel/testfiles/m3int002.xetex.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3int002.xetex.tlg 2016-12-05 14:38:24 UTC (rev 6779)
+++ trunk/l3kernel/testfiles/m3int002.xetex.tlg 2016-12-05 14:46:39 UTC (rev 6780)
@@ -655,7 +655,6 @@
============================================================
TEST 49: Internal integer constants
============================================================
--1
0
1
2
Modified: trunk/l3trial/l3bigint/l3bigint.dtx
===================================================================
--- trunk/l3trial/l3bigint/l3bigint.dtx 2016-12-05 14:38:24 UTC (rev 6779)
+++ trunk/l3trial/l3bigint/l3bigint.dtx 2016-12-05 14:46:39 UTC (rev 6780)
@@ -870,6 +870,13 @@
%
% \subsubsection{Main parsing functions}
%
+% \begin{variable}{\c_@@_prec_end_int}
+% Precedence of the start of the expression.
+% \begin{macrocode}
+\int_const:Nn \c_@@_prec_end_int { -1 }
+% \end{macrocode}
+% \end{variable}
+%
% \begin{macro}[int, EXP]{\@@_parse_do:nn}
% \begin{macro}[aux, EXP]{\@@_parse_do_aux:w}
% Parse an expression and run some code~|#2| on the result.
@@ -889,7 +896,7 @@
% This should be called within \cs{exp:w}.
% The \cs{@@_parse_operand:Nw} function will perform
% computations until reaching an operation with precedence
-% \cs{c_minus_one} or less, namely, the end of the expression. The
+% \cs{c_@@_prec_end_int} or less, namely, the end of the expression. The
% marker \cs{s_@@_mark} indicates that the next token is an already
% parsed version of an infix operator, and \cs{@@_parse_infix_end:N}
% has infinitely negative precedence. Finally, clean up a
@@ -900,7 +907,7 @@
{
\exp_after:wN \@@_parse_after:ww
\exp:w
- \@@_parse_operand:Nw \c_minus_one
+ \@@_parse_operand:Nw \c_@@_prec_end_int
\exp_end_continue_f:nw #1
\s_@@_mark \@@_parse_infix_end:N
\s_@@_stop
@@ -1549,7 +1556,7 @@
% \begin{macrocode}
\cs_new:Npn \@@_tree_dp:n % expects "{<digits>}" (non-zero multiple of 8 digits, first block non-zero), outputs "<depth>.<tree>"
{
- \@@_int_value:w \@@_int_eval:w \c_minus_one
+ \@@_int_value:w \@@_int_eval:w - \c_one
\@@_tree_dp_aux:n
}
\cs_new:Npn \@@_tree_dp_aux:n #1
@@ -1638,7 +1645,7 @@
}
\cs_new:Npn \@@_diff_sign_dd:w #1 ; #2 ;
{
- \if_int_compare:w #1 < #2 \c_minus_one \fi:
+ \if_int_compare:w #1 < #2 - \c_one \fi:
\if_int_compare:w #1 > #2 \c_one \fi:
}
% \end{macrocode}
@@ -2595,7 +2602,7 @@
\or:
\if_int_compare:w
\@@_str_cmp_x:nn {#3} { 00000021 47483648 }
- = \c_minus_one
+ = - \c_one
\prg_return_true:
\else:
\prg_return_false:
Modified: trunk/l3trial/xfont/build.lua
===================================================================
--- trunk/l3trial/xfont/build.lua 2016-12-05 14:38:24 UTC (rev 6779)
+++ trunk/l3trial/xfont/build.lua 2016-12-05 14:46:39 UTC (rev 6780)
@@ -13,6 +13,7 @@
-- Non-standard settings
installfiles = {"*.cfg", "*.ltx", "*.sty"}
sourcefiles = {"*.dtx", "*.ins", "*.ltx"}
+typesetfiles = {}
checkdeps = {maindir .. "/l3kernel", maindir .. "/l3packages/xparse", "../l3hooks"}
typesetdeps = {maindir .. "/l3kernel", "../l3hooks"}
Modified: trunk/l3trial/xfont/xfss.dtx
===================================================================
--- trunk/l3trial/xfont/xfss.dtx 2016-12-05 14:38:24 UTC (rev 6779)
+++ trunk/l3trial/xfont/xfss.dtx 2016-12-05 14:46:39 UTC (rev 6780)
@@ -1434,7 +1434,7 @@
\cs_if_exist:cF { \g_xfss_fontface_csname_tl }
{
\group_begin:
- \int_set:Nn \tex_escapechar:D {\c_minus_one}
+ \int_set:Nn \tex_escapechar:D { - \c_one }
\exp_after:wN \xfss_fontface_split:w \g_xfss_fontface_csname_tl \q_nil
\xfss_font_try_load_family: % try always
\cs_if_exist:cTF { \l_xfss_current_font_tl }
@@ -1942,7 +1942,7 @@
\cs_new_protected:Npn \xfss_process_table_check_error_font:
{
\group_begin:
- \int_set:Nn \tex_escapechar:D {\c_minus_one}
+ \int_set:Nn \tex_escapechar:D { - \c_one }
\xfss_error_font:
\cs_if_exist:cF {\l_xfss_current_font_tl}
{
@@ -2041,7 +2041,7 @@
\bool_if:NT \l_xfss_math_fonts_bool
{
\group_begin:
- \int_set:Nn \tex_escapechar:D {\c_minus_one}
+ \int_set:Nn \tex_escapechar:D { - \c_one }
\xfss_math_version_use:x { \l_xfss_math_version_tl }
\l_xfss_math_fonts_assign_tl
\tl_gset_eq:NN \g_xfss_setup_currsize_tl \l_xfss_size_tl
@@ -2954,7 +2954,7 @@
< \c_max_math_fonts_int
{
\group_begin:
- \int_set:Nn \tex_escapechar:D {\c_minus_one}
+ \int_set:Nn \tex_escapechar:D { - \c_one }
\exp_args:Nv \xfss_get_and_define_fonts:nn
{g_xfss_mversion_ \l_xfss_math_version_tl _int} #3
\l_xfss_math_fonts_assign_tl
More information about the latex3-commits
mailing list