asy 1.96

git-svn-id: svn://tug.org/texlive/trunk@18817 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 41 insertions, 38 deletions

diff --git a/Build/source/utils/asymptote/runarray.cc b/Build/source/utils/asymptote/runarray.cc
index 257464d3bb9..0ae52bcf918 100644
--- a/Build/source/utils/asymptote/runarray.cc
+++ b/Build/source/utils/asymptote/runarray.cc
@@ -27,6 +27,7 @@
 #include "array.h"
 #include "triple.h"
 #include "callable.h"
+#include "opsymbols.h"
 
 using vm::stack;
 using vm::error;
@@ -528,6 +529,8 @@ void integeroverflow(size_t i)
 
 
 
+#include "runarray.symbols.h"
+
 namespace run {
 // Create an empty array.
 #line 444 "runarray.in"
@@ -1991,8 +1994,8 @@ void gen_runarray65(stack *Stack)
 #ifdef HAVE_LIBFFTW3
   array *c=new array(n);
   if(n) {
-    Complex *f=ComplexAlign(n);
-    fft1d Forward(n,intcast(sign),f);
+    Complex *f=fftwpp::ComplexAlign(n);
+    fftwpp::fft1d Forward(n,intcast(sign),f);
   
     for(size_t i=0; i < n; i++) {
       pair z=read<pair>(a,i);
@@ -2004,7 +2007,7 @@ void gen_runarray65(stack *Stack)
       Complex z=f[i];
       (*c)[i]=pair(z.real(),z.imag());
     }
-    deleteAlign(f);
+    fftwpp::deleteAlign(f);
   }
 #else
   unused(&n);
@@ -2299,21 +2302,21 @@ void gen_runarray_venv(venv &ve)
 #line 717 "runarray.in"
   REGISTER_BLTIN(run::arrayIntArray,"arrayIntArray");
 #line 735 "runarray.in"
-  addFunc(ve, run::gen_runarray31, IntArray(), "complement", formal(IntArray(), "a", false, false), formal(primInt(), "n", false, false));
+  addFunc(ve, run::gen_runarray31, IntArray(), SYM(complement), formal(IntArray(), SYM(a), false, false), formal(primInt(), SYM(n), false, false));
 #line 754 "runarray.in"
   REGISTER_BLTIN(run::arraySequence,"arraySequence");
 #line 767 "runarray.in"
-  addFunc(ve, run::gen_runarray33, IntArray(), "sequence", formal(primInt(), "n", false, false));
+  addFunc(ve, run::gen_runarray33, IntArray(), SYM(sequence), formal(primInt(), SYM(n), false, false));
 #line 778 "runarray.in"
   REGISTER_BLTIN(run::arrayFunction,"arrayFunction");
 #line 791 "runarray.in"
   REGISTER_BLTIN(run::arraySort,"arraySort");
 #line 800 "runarray.in"
-  addFunc(ve, run::gen_runarray36, primBoolean(), "all", formal(booleanArray(), "a", false, false));
+  addFunc(ve, run::gen_runarray36, primBoolean(), SYM(all), formal(booleanArray(), SYM(a), false, false));
 #line 809 "runarray.in"
-  addFunc(ve, run::gen_runarray37, booleanArray(), "!", formal(booleanArray(), "a", false, false));
+  addFunc(ve, run::gen_runarray37, booleanArray(), SYM_LOGNOT, formal(booleanArray(), SYM(a), false, false));
 #line 818 "runarray.in"
-  addFunc(ve, run::gen_runarray38, primInt(), "sum", formal(booleanArray(), "a", false, false));
+  addFunc(ve, run::gen_runarray38, primInt(), SYM(sum), formal(booleanArray(), SYM(a), false, false));
 #line 827 "runarray.in"
   REGISTER_BLTIN(run::arrayCopy,"arrayCopy");
 #line 832 "runarray.in"
@@ -2327,67 +2330,67 @@ void gen_runarray_venv(venv &ve)
 #line 894 "runarray.in"
   REGISTER_BLTIN(run::array3Transpose,"array3Transpose");
 #line 981 "runarray.in"
-  addFunc(ve, run::gen_runarray45, primInt(), "find", formal(booleanArray(), "a", false, false), formal(primInt(), "n", true, false));
+  addFunc(ve, run::gen_runarray45, primInt(), SYM(find), formal(booleanArray(), SYM(a), false, false), formal(primInt(), SYM(n), true, false));
 #line 1000 "runarray.in"
   REGISTER_BLTIN(run::arrayConditional,"arrayConditional");
 #line 1026 "runarray.in"
-  addFunc(ve, run::gen_runarray47, realArray2(), "identity", formal(primInt(), "n", false, false));
+  addFunc(ve, run::gen_runarray47, realArray2(), SYM(identity), formal(primInt(), SYM(n), false, false));
 #line 1032 "runarray.in"
-  addFunc(ve, run::gen_runarray48, realArray2(), "inverse", formal(realArray2(), "a", false, false));
+  addFunc(ve, run::gen_runarray48, realArray2(), SYM(inverse), formal(realArray2(), SYM(a), false, false));
 #line 1124 "runarray.in"
-  addFunc(ve, run::gen_runarray49, realArray(), "solve", formal(realArray2(), "a", false, false), formal(realArray(), "b", false, false), formal(primBoolean(), "warn", true, false));
+  addFunc(ve, run::gen_runarray49, realArray(), SYM(solve), formal(realArray2(), SYM(a), false, false), formal(realArray(), SYM(b), false, false), formal(primBoolean(), SYM(warn), true, false));
 #line 1177 "runarray.in"
-  addFunc(ve, run::gen_runarray50, realArray2(), "solve", formal(realArray2(), "a", false, false), formal(realArray2(), "b", false, false), formal(primBoolean(), "warn", true, false));
+  addFunc(ve, run::gen_runarray50, realArray2(), SYM(solve), formal(realArray2(), SYM(a), false, false), formal(realArray2(), SYM(b), false, false), formal(primBoolean(), SYM(warn), true, false));
 #line 1242 "runarray.in"
-  addFunc(ve, run::gen_runarray51, primReal(), "determinant", formal(realArray2(), "a", false, false));
+  addFunc(ve, run::gen_runarray51, primReal(), SYM(determinant), formal(realArray2(), SYM(a), false, false));
 #line 1259 "runarray.in"
-  addFunc(ve, run::gen_runarray52, realArray(), "*", formal(realArray2(), "a", false, false), formal(realArray(), "b", false, false));
+  addFunc(ve, run::gen_runarray52, realArray(), SYM_TIMES, formal(realArray2(), SYM(a), false, false), formal(realArray(), SYM(b), false, false));
 #line 1278 "runarray.in"
-  addFunc(ve, run::gen_runarray53, realArray(), "*", formal(realArray(), "a", false, false), formal(realArray2(), "b", false, false));
+  addFunc(ve, run::gen_runarray53, realArray(), SYM_TIMES, formal(realArray(), SYM(a), false, false), formal(realArray2(), SYM(b), false, false));
 #line 1307 "runarray.in"
-  addFunc(ve, run::gen_runarray54, IntArray2(), "*", formal(IntArray2(), "a", false, false), formal(IntArray2(), "b", false, false));
+  addFunc(ve, run::gen_runarray54, IntArray2(), SYM_TIMES, formal(IntArray2(), SYM(a), false, false), formal(IntArray2(), SYM(b), false, false));
 #line 1312 "runarray.in"
-  addFunc(ve, run::gen_runarray55, realArray2(), "*", formal(realArray2(), "a", false, false), formal(realArray2(), "b", false, false));
+  addFunc(ve, run::gen_runarray55, realArray2(), SYM_TIMES, formal(realArray2(), SYM(a), false, false), formal(realArray2(), SYM(b), false, false));
 #line 1317 "runarray.in"
-  addFunc(ve, run::gen_runarray56, pairArray2(), "*", formal(pairArray2(), "a", false, false), formal(pairArray2(), "b", false, false));
+  addFunc(ve, run::gen_runarray56, pairArray2(), SYM_TIMES, formal(pairArray2(), SYM(a), false, false), formal(pairArray2(), SYM(b), false, false));
 #line 1322 "runarray.in"
-  addFunc(ve, run::gen_runarray57, primTriple(), "*", formal(realArray2(), "t", false, false), formal(primTriple(), "v", false, false));
+  addFunc(ve, run::gen_runarray57, primTriple(), SYM_TIMES, formal(realArray2(), SYM(t), false, false), formal(primTriple(), SYM(v), false, false));
 #line 1327 "runarray.in"
-  addFunc(ve, run::gen_runarray58, primPair(), "project", formal(primTriple(), "v", false, false), formal(realArray2(), "t", false, false));
+  addFunc(ve, run::gen_runarray58, primPair(), SYM(project), formal(primTriple(), SYM(v), false, false), formal(realArray2(), SYM(t), false, false));
 #line 1352 "runarray.in"
-  addFunc(ve, run::gen_runarray59, primReal(), "dot", formal(realArray(), "a", false, false), formal(realArray(), "b", false, false));
+  addFunc(ve, run::gen_runarray59, primReal(), SYM(dot), formal(realArray(), SYM(a), false, false), formal(realArray(), SYM(b), false, false));
 #line 1362 "runarray.in"
-  addFunc(ve, run::gen_runarray60, primPair(), "dot", formal(pairArray(), "a", false, false), formal(pairArray(), "b", false, false));
+  addFunc(ve, run::gen_runarray60, primPair(), SYM(dot), formal(pairArray(), SYM(a), false, false), formal(pairArray(), SYM(b), false, false));
 #line 1372 "runarray.in"
-  addFunc(ve, run::gen_runarray61, realArray(), "tridiagonal", formal(realArray(), "a", false, false), formal(realArray(), "b", false, false), formal(realArray(), "c", false, false), formal(realArray(), "f", false, false));
+  addFunc(ve, run::gen_runarray61, realArray(), SYM(tridiagonal), formal(realArray(), SYM(a), false, false), formal(realArray(), SYM(b), false, false), formal(realArray(), SYM(c), false, false), formal(realArray(), SYM(f), false, false));
 #line 1476 "runarray.in"
-  addFunc(ve, run::gen_runarray62, primReal(), "newton", formal(primInt(), "iterations", true, false), formal(realRealFunction(), "f", false, false), formal(realRealFunction(), "fprime", false, false), formal(primReal(), "x", false, false), formal(primBoolean(), "verbose", true, false));
+  addFunc(ve, run::gen_runarray62, primReal(), SYM(newton), formal(primInt(), SYM(iterations), true, false), formal(realRealFunction(), SYM(f), false, false), formal(realRealFunction(), SYM(fprime), false, false), formal(primReal(), SYM(x), false, false), formal(primBoolean(), SYM(verbose), true, false));
 #line 1523 "runarray.in"
-  addFunc(ve, run::gen_runarray63, primReal(), "newton", formal(primInt(), "iterations", true, false), formal(realRealFunction(), "f", false, false), formal(realRealFunction(), "fprime", false, false), formal(primReal(), "x1", false, false), formal(primReal(), "x2", false, false), formal(primBoolean(), "verbose", true, false));
+  addFunc(ve, run::gen_runarray63, primReal(), SYM(newton), formal(primInt(), SYM(iterations), true, false), formal(realRealFunction(), SYM(f), false, false), formal(realRealFunction(), SYM(fprime), false, false), formal(primReal(), SYM(x1), false, false), formal(primReal(), SYM(x2), false, false), formal(primBoolean(), SYM(verbose), true, false));
 #line 1605 "runarray.in"
-  addFunc(ve, run::gen_runarray64, primReal(), "simpson", formal(realRealFunction(), "f", false, false), formal(primReal(), "a", false, false), formal(primReal(), "b", false, false), formal(primReal(), "acc", true, false), formal(primReal(), "dxmax", true, false));
+  addFunc(ve, run::gen_runarray64, primReal(), SYM(simpson), formal(realRealFunction(), SYM(f), false, false), formal(primReal(), SYM(a), false, false), formal(primReal(), SYM(b), false, false), formal(primReal(), SYM(acc), true, false), formal(primReal(), SYM(dxmax), true, false));
 #line 1617 "runarray.in"
-  addFunc(ve, run::gen_runarray65, pairArray(), "fft", formal(pairArray(), "a", false, false), formal(primInt(), "sign", true, false));
+  addFunc(ve, run::gen_runarray65, pairArray(), SYM(fft), formal(pairArray(), SYM(a), false, false), formal(primInt(), SYM(sign), true, false));
 #line 1648 "runarray.in"
-  addFunc(ve, run::gen_runarray66, IntArray2(), "triangulate", formal(pairArray(), "z", false, false));
+  addFunc(ve, run::gen_runarray66, IntArray2(), SYM(triangulate), formal(pairArray(), SYM(z), false, false));
 #line 1683 "runarray.in"
-  addFunc(ve, run::gen_runarray67, primReal(), "norm", formal(realArray(), "a", false, false));
+  addFunc(ve, run::gen_runarray67, primReal(), SYM(norm), formal(realArray(), SYM(a), false, false));
 #line 1694 "runarray.in"
-  addFunc(ve, run::gen_runarray68, primReal(), "norm", formal(realArray2(), "a", false, false));
+  addFunc(ve, run::gen_runarray68, primReal(), SYM(norm), formal(realArray2(), SYM(a), false, false));
 #line 1709 "runarray.in"
-  addFunc(ve, run::gen_runarray69, primReal(), "norm", formal(tripleArray2(), "a", false, false));
+  addFunc(ve, run::gen_runarray69, primReal(), SYM(norm), formal(tripleArray2(), SYM(a), false, false));
 #line 1724 "runarray.in"
-  addFunc(ve, run::gen_runarray70, primReal(), "change2", formal(tripleArray2(), "a", false, false));
+  addFunc(ve, run::gen_runarray70, primReal(), SYM(change2), formal(tripleArray2(), SYM(a), false, false));
 #line 1746 "runarray.in"
-  addFunc(ve, run::gen_runarray71, primTriple(), "minbezier", formal(tripleArray2(), "p", false, false), formal(primTriple(), "b", false, false));
+  addFunc(ve, run::gen_runarray71, primTriple(), SYM(minbezier), formal(tripleArray2(), SYM(p), false, false), formal(primTriple(), SYM(b), false, false));
 #line 1756 "runarray.in"
-  addFunc(ve, run::gen_runarray72, primTriple(), "maxbezier", formal(tripleArray2(), "p", false, false), formal(primTriple(), "b", false, false));
+  addFunc(ve, run::gen_runarray72, primTriple(), SYM(maxbezier), formal(tripleArray2(), SYM(p), false, false), formal(primTriple(), SYM(b), false, false));
 #line 1766 "runarray.in"
-  addFunc(ve, run::gen_runarray73, primPair(), "minratio", formal(tripleArray2(), "p", false, false), formal(primPair(), "b", false, false));
+  addFunc(ve, run::gen_runarray73, primPair(), SYM(minratio), formal(tripleArray2(), SYM(p), false, false), formal(primPair(), SYM(b), false, false));
 #line 1777 "runarray.in"
-  addFunc(ve, run::gen_runarray74, primPair(), "maxratio", formal(tripleArray2(), "p", false, false), formal(primPair(), "b", false, false));
+  addFunc(ve, run::gen_runarray74, primPair(), SYM(maxratio), formal(tripleArray2(), SYM(p), false, false), formal(primPair(), SYM(b), false, false));
 #line 1788 "runarray.in"
-  addFunc(ve, run::gen_runarray75, realArray(), "_projection");
+  addFunc(ve, run::gen_runarray75, realArray(), SYM(_projection));
 }
 
 } // namespace trans