Provide "help". Print a prompt

diff --git a/main.cc b/main.cc
index fbacbfb985846c958f9c517beab2c3b762d099b4..593cf01aad65efcd1a2fec56f066d354db4a59f5 100644 (file)
--- a/main.cc
+++ b/main.cc
@@ -111,6 +111,7 @@ int main(int argc, char **argv) {
     if (x11) list->display(*x11);
     if (dualx11) list->display(*dualx11);
     for (;;) {
+      cerr << "> ";
       cin.getline(buf,sizeof(buf),'\n');
       if (!cin.good()) {
        cerr << "error reading command input, giving up\n";
@@ -156,6 +157,8 @@ int main(int argc, char **argv) {
       } else if (!strcmp(buf,"quit")) {
         exit(0);
       } else if (!strcmp(buf,"list")) {
+        AnyParameter::help();
+      } else if (!strcmp(buf,"help")) {
         AnyParameter::list();
       } else if (!*buf) {
         break;

diff --git a/parameter.cc b/parameter.cc
index 89566fde067a1ee49dd3a7fa51fd0c0e3884c770..cc8b17516dbb6e18324407ca85335c64788ca803 100644 (file)
--- a/parameter.cc
+++ b/parameter.cc
@@ -18,11 +18,26 @@ AnyParameter* AnyParameter::find(const char *n) {
   return search;
 }
 
+void AnyParameter::printvalue(void) {
+  cerr << name << " ";
+  rangecheckprint();
+}
+
 void AnyParameter::list() {
   for (AnyParameter* search= first;
        search;
-       search= search->next)
-    search->rangecheck();
+       search= search->next) {
+    cerr << search->description << ": ";
+    search->printvalue();
+  }
+}
+
+void AnyParameter::help() {
+  for (AnyParameter* search= first;
+       search;
+       search= search->next) {
+    search->printvalue();
+  }
 }
 
 AnyParameter* AnyParameter::first= 0;

diff --git a/parameter.hh b/parameter.hh
index 07b0137c0f6c3128732d33d40ace520ea2a13fe7..b426e3746560af8aea0390c40008596a57ee6654 100644 (file)
--- a/parameter.hh
+++ b/parameter.hh
@@ -13,7 +13,8 @@ class AnyParameter {
 protected:
   const char *name;
   const char *description;
-  virtual void rangecheck() =0;
+  void printvalue();
+  virtual void rangecheckprint() =0;
 public:
   AnyParameter(const char *n, const char *d);
   virtual void operator ++() =0;
@@ -21,17 +22,18 @@ public:
   virtual void operator =(double) =0;
   static AnyParameter *find(const char *n);
   static void list();
+  static void help();
 };
 
 template<class T> class Parameter : AnyParameter {
   T value, delta, min, max;
-  void rangecheck();
+  void rangecheckprint();
 public:
   Parameter(const char *n, const char *d, T i, T de, T mi, T ma);
   operator T (){ return value; }
-  void operator ++(){ value+= delta; rangecheck(); }
-  void operator --(){ value-= delta; rangecheck(); }
-  void operator =(double v) { value= (T)v; rangecheck(); }
+  void operator ++(){ value+= delta; rangecheckprint(); }
+  void operator --(){ value-= delta; rangecheckprint(); }
+  void operator =(double v) { value= (T)v; rangecheckprint(); }
 };
 
 template<class T> Parameter<T>::Parameter
@@ -40,8 +42,7 @@ template<class T> Parameter<T>::Parameter
   value=i; delta=de; min=mi; max=ma;
 }
 
-template<class T> void Parameter<T>::rangecheck() {
-  cerr << name << " ";
+template<class T> void Parameter<T>::rangecheckprint() {
   if (value<min) {
     value= min;  cerr << "underflowed; ";
   } else if (value>max) {