From 43f5f4935c211a0169e0b919a3ac7160fcb9aaba Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (office)" <j.wuttke@fz-juelich.de>
Date: Mon, 1 Feb 2010 16:55:13 +0100
Subject: [PATCH] adapt to more explicit filenames ask_*.h in read-plus

---
 pub/src/coord.cpp    | 2 +-
 pub/src/curve.cpp    | 4 ++--
 pub/src/dualplot.cpp | 4 ++--
 pub/src/edif.cpp     | 2 +-
 pub/src/expr.cpp     | 7 ++++---
 pub/src/file_in.cpp  | 2 +-
 pub/src/file_out.cpp | 2 +-
 pub/src/frida2.cpp   | 2 +-
 pub/src/func.cpp     | 2 +-
 pub/src/index.cpp    | 2 +-
 pub/src/list.cpp     | 2 +-
 pub/src/manip.cpp    | 2 +-
 pub/src/olm.cpp      | 2 +-
 pub/src/opr.cpp      | 2 +-
 pub/src/rssm.cpp     | 2 +-
 pub/src/special2.cpp | 2 +-
 16 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/pub/src/coord.cpp b/pub/src/coord.cpp
index e7ebe88d..c3552c5b 100644
--- a/pub/src/coord.cpp
+++ b/pub/src/coord.cpp
@@ -10,7 +10,7 @@
 #include <string.h>
 using namespace std;
 
-#include <gar.h>
+#include <ask_and_callback.h>
 
 #include "mystd.h"
 #include "coord.h"
diff --git a/pub/src/curve.cpp b/pub/src/curve.cpp
index 56f4e5a6..c9b56ae9 100644
--- a/pub/src/curve.cpp
+++ b/pub/src/curve.cpp
@@ -18,8 +18,8 @@ using namespace std;
 #include "mystd.h"
 #include "olm.h" // includes also curve.h
 #include "expr.h"
-#include "readln.h"
-#include "asi.h"
+#include <readln.h>
+#include <ask_simple_value.h>
 #include "xax_lex.h"
 
 //! local functions (wouldn't suffice "static" ??)
diff --git a/pub/src/dualplot.cpp b/pub/src/dualplot.cpp
index 78950d01..9c1c6dcc 100644
--- a/pub/src/dualplot.cpp
+++ b/pub/src/dualplot.cpp
@@ -18,8 +18,8 @@
 #include "mystd.h"
 #include "plotaux.h"
 #include "coord.h"
-#include "asi.h"
-#include "gar.h"
+#include <ask_simple_value.h>
+#include <ask_and_callback.h>
 #include "dualplot.h"
 
 using boost::format;
diff --git a/pub/src/edif.cpp b/pub/src/edif.cpp
index 3214d46a..d27988f2 100644
--- a/pub/src/edif.cpp
+++ b/pub/src/edif.cpp
@@ -14,7 +14,7 @@
 #include "mystd.h"
 #include "olm.h"
 #include "expr.h"
-#include "asi.h"
+#include <ask_simple_value.h>
 #include "dualplot.h"
 #include "edif.h"
 #include "index.h"
diff --git a/pub/src/expr.cpp b/pub/src/expr.cpp
index 8ff7b3de..5f89a21b 100644
--- a/pub/src/expr.cpp
+++ b/pub/src/expr.cpp
@@ -14,6 +14,10 @@
 #include "expr.h"
 #include "readln.h"
 
+// for calculator:
+#include <ask_simple_value.h>
+#include "readln.h"
+
 bool debug = false;
 extern bool allow_slow_conv;
 #define DEB(args) if ( debug ) printf args
@@ -905,9 +909,6 @@ void CTree::npar_exec( uint *np ) const
 //* direct access from main program                                         *//
 //***************************************************************************//
 
-#include "asi.h"
-#include "readln.h"
-
 void NCalc::Calculator() 
 {
     string s;
diff --git a/pub/src/file_in.cpp b/pub/src/file_in.cpp
index 0ef50b35..87fbfbb7 100644
--- a/pub/src/file_in.cpp
+++ b/pub/src/file_in.cpp
@@ -11,7 +11,7 @@
 
 #include "mystd.h"
 #include "olm.h"
-#include "asi.h"
+#include <ask_simple_value.h>
 #include "file_in.h"
 #include "yamc.h"
 
diff --git a/pub/src/file_out.cpp b/pub/src/file_out.cpp
index 3cc4a0d9..3c06fbed 100644
--- a/pub/src/file_out.cpp
+++ b/pub/src/file_out.cpp
@@ -11,7 +11,7 @@
 
 #include "mystd.h"
 #include "olm.h"
-#include "asi.h"
+#include <ask_simple_value.h>
 #include "file_out.h"
 
 using namespace std;
diff --git a/pub/src/frida2.cpp b/pub/src/frida2.cpp
index 6fda68a1..b9cd466f 100644
--- a/pub/src/frida2.cpp
+++ b/pub/src/frida2.cpp
@@ -14,7 +14,7 @@
 #include "mystd.h"
 #include "olm.h"
 #include "expr.h" // for NCalc
-#include "asi.h"
+#include <ask_simple_value.h>
 #include "readln.h"
 #include "dualplot.h"
 #include "opr.h"
diff --git a/pub/src/func.cpp b/pub/src/func.cpp
index a5a47b1a..8d6ac84b 100644
--- a/pub/src/func.cpp
+++ b/pub/src/func.cpp
@@ -14,7 +14,7 @@
 #include <kww.h>
 #include "rng.h"
 #include "olm.h" // for func_data_, comes with many includes
-#include "asi.h" // for find
+#include <ask_simple_value.h> //for find
 
 double twopi = 8*atan(1.);
 
diff --git a/pub/src/index.cpp b/pub/src/index.cpp
index 7b912231..fa62804b 100644
--- a/pub/src/index.cpp
+++ b/pub/src/index.cpp
@@ -13,7 +13,7 @@ using namespace std;
 
 #include "mystd.h"
 #include "index.h"
-#include <gar.h>   // for ask
+#include <ask_plus.h>
 
 namespace IndexParse
 {
diff --git a/pub/src/list.cpp b/pub/src/list.cpp
index e5d945f3..a64eddaf 100644
--- a/pub/src/list.cpp
+++ b/pub/src/list.cpp
@@ -13,7 +13,7 @@
 using namespace std;
 
 #include "mystd.h"
-#include "gar.h"
+#include <ask_and_callback.h>
 #include "list.h"
 
 
diff --git a/pub/src/manip.cpp b/pub/src/manip.cpp
index 23e3029c..52fc83b8 100644
--- a/pub/src/manip.cpp
+++ b/pub/src/manip.cpp
@@ -16,7 +16,7 @@
 #include "mystd.h"
 #include "olm.h"
 #include "expr.h"
-#include "asi.h"
+#include <ask_simple_value.h>
 #include "manip.h"
 #include "dualplot.h" // wg. edif.h
 #include "edif.h" // wg. ListZ()
diff --git a/pub/src/olm.cpp b/pub/src/olm.cpp
index 66c138f7..617b8f96 100644
--- a/pub/src/olm.cpp
+++ b/pub/src/olm.cpp
@@ -13,7 +13,7 @@ using namespace std;
 
 #include "mystd.h"
 #include "olm.h"
-#include "asi.h"
+#include <ask_simple_value.h>
 
 //***************************************************************************//
 //* class COld                                                              *//
diff --git a/pub/src/opr.cpp b/pub/src/opr.cpp
index 6507672c..9c11ce78 100644
--- a/pub/src/opr.cpp
+++ b/pub/src/opr.cpp
@@ -15,7 +15,7 @@ using namespace std;
 #include "mystd.h"
 #include "olm.h"
 #include "expr.h"
-#include "asi.h"
+#include <ask_simple_value.h>
 #include "opr.h"
 #include "xax_lex.h"
 
diff --git a/pub/src/rssm.cpp b/pub/src/rssm.cpp
index ebdf49a8..81922903 100644
--- a/pub/src/rssm.cpp
+++ b/pub/src/rssm.cpp
@@ -12,7 +12,7 @@
 
 #include "mystd.h"
 #include "olm.h"
-#include "asi.h"
+#include <ask_simple_value.h>
 #include "rssm.h"
 #include "yamc.h"
 
diff --git a/pub/src/special2.cpp b/pub/src/special2.cpp
index 00d197ba..d7add616 100644
--- a/pub/src/special2.cpp
+++ b/pub/src/special2.cpp
@@ -8,7 +8,7 @@
 using namespace std;
 
 #include "olm.h"
-#include "asi.h"
+#include <ask_simple_value.h>
 #include "special.h"
 
 namespace NSpecial {
-- 
GitLab