From 27b09fc457c10067f5aaa77ed150628095060751 Mon Sep 17 00:00:00 2001
From: Jonas Baggett <jonasb@tranquille.ch>
Date: Wed, 3 Aug 2016 14:09:44 +0200
Subject: Rename --wave-option-file to --wave-opt-file

Documentation and description added for the --wave-opt-file option.
---
 doc/Simulation_and_runtime.rst | 14 ++++++++++----
 src/grt/grt-options.adb        |  8 ++++----
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/doc/Simulation_and_runtime.rst b/doc/Simulation_and_runtime.rst
index 37a83521f..979a9892a 100644
--- a/doc/Simulation_and_runtime.rst
+++ b/doc/Simulation_and_runtime.rst
@@ -69,7 +69,7 @@ all options available, including the debugging one.
 
     $ ./my_design --stop-time=10ns
     $ ./my_design --stop-time=ps
-    
+
 
 .. option:: --stop-delta=<N>
 
@@ -118,6 +118,12 @@ all options available, including the debugging one.
   Disable buffering on stdout, stderr and files opened in write or append mode (TEXTIO).
 
 
+.. option:: --wave-opt-file=<FILENAME>
+
+  Filter signals to be dumped to the wave file according to the wave option
+  file provided.
+
+
 .. option:: --vcd=<FILENAME>
 
 .. option:: --vcdgz=<FILENAME>
@@ -208,7 +214,7 @@ all options available, including the debugging one.
   generate labels or block labels.  Currently, you cannot use an indexed name.
 
   Specifying a delay::
-    
+
    --sdf=min=<PATH>=<FILENAME>
    --sdf=typ=<PATH>=<FILENAME>
    --sdf=max=<PATH>=<FILENAME>
@@ -222,7 +228,7 @@ all options available, including the debugging one.
 
 
 .. option:: --help
-   
+
   Display a short description of the options accepted by the runtime library.
 
 Debugging VHDL programs
@@ -246,6 +252,6 @@ an array beyond its bounds.  All error check subprograms call the
 a breakpoint like this:
 
   (gdb) break __ghdl_fatal
-  
+
 When the breakpoint is hit, use the `where` or `bt` command to
 display the stack frames.
diff --git a/src/grt/grt-options.adb b/src/grt/grt-options.adb
index 31bd3b45c..6c3f333d3 100644
--- a/src/grt/grt-options.adb
+++ b/src/grt/grt-options.adb
@@ -165,6 +165,7 @@ package body Grt.Options is
       P (" --no-run          do not simulate, only elaborate");
       P (" --unbuffered      disable buffering on stdout, stderr and");
       P ("                   files opened in write or append mode (TEXTIO).");
+      P (" --wave-opt-file=FILENAME  read a wave option file");
       --  P (" --threads=N       use N threads for simulation");
       P ("Additional features:");
       P (" --has-feature=X   test presence of feature X");
@@ -481,14 +482,13 @@ package body Grt.Options is
             end if;
             Last_Generic_Override := Over;
          end;
-      elsif Option'Length >= 19
-        and then Option (1 .. 19) = "--wave-option-file="
-      then
-         Wave_Opt_File.Parse.Start (Option (20 .. Option'Last));
       elsif Option = "--unbuffered" then
          Unbuffered_Writes := True;
          setbuf (stdout, NULL_voids);
          setbuf (stderr, NULL_voids);
+      elsif Option'Length >= 16 and then Option (1 .. 16) = "--wave-opt-file="
+      then
+         Wave_Opt_File.Parse.Start (Option (17 .. Option'Last));
       elsif not Grt.Hooks.Call_Option_Hooks (Option) then
          Error_C ("unknown option '");
          Error_C (Option);
-- 
cgit v1.2.3