bug concerning constant evaluation fixed

2 files changed, 23 insertions, 23 deletions

diff --git a/data/advopt.txt b/data/advopt.txt
index 975c09af8..1fe4e0e6e 100755
--- a/data/advopt.txt
+++ b/data/advopt.txt
@@ -1,9 +1,9 @@
 Advanced commands::
   pas                       convert a Pascal file to Nimrod syntax
   pretty                    pretty print the inputfile
-  gen_depend                generate a DOT file containing the
+  genDepend                 generate a DOT file containing the
                             module dependency graph
-  list_def                  list all defined conditionals and exit
+  listDef                   list all defined conditionals and exit
   check                     checks the project for syntax and semantic
   parse                     parses a single file (for debugging Nimrod)
 Advanced options:
@@ -12,27 +12,27 @@ Advanced options:
   --hints:on|off            hints ON|OFF
   --hint[X]:on|off          specific hint X ON|OFF
   --lib:PATH                set the system library path
-  -c, --compile_only        compile only; do not assemble or link
-  --no_linking              compile but do not link
-  --no_main                 do not generate a main procedure
-  --gen_script              generate a compile script (in the 'nimcache'
+  -c, --compileOnly         compile only; do not assemble or link
+  --noLinking               compile but do not link
+  --noMain                  do not generate a main procedure
+  --genScript               generate a compile script (in the 'nimcache'
                             subdirectory named 'compile_$project$scriptext')
   --os:SYMBOL               set the target operating system (cross-compilation)
   --cpu:SYMBOL              set the target processor (cross-compilation)
   --debuginfo               enables debug information
   -t, --passc:OPTION        pass an option to the C compiler
   -l, --passl:OPTION        pass an option to the linker
-  --gen_mapping             generate a mapping file containing
+  --genMapping              generate a mapping file containing
                             (Nimrod, mangled) identifier pairs
-  --line_dir:on|off         generation of #line directive ON|OFF
+  --lineDir:on|off          generation of #line directive ON|OFF
   --checkpoints:on|off      turn on|off checkpoints; for debugging Nimrod
-  --skip_cfg                do not read the general configuration file
-  --skip_proj_cfg           do not read the project's configuration file
+  --skipCfg                 do not read the general configuration file
+  --skipProjCfg             do not read the project's configuration file
   --gc:refc|boehm|none      use Nimrod's native GC|Boehm GC|no GC
   --index:FILE              use FILE to generate a documenation index file
   --putenv:key=value        set an environment variable
-  --list_cmd                list the commands used to execute external programs
-  --parallel_build=0|1|...  perform a parallel build
+  --listCmd                 list the commands used to execute external programs
+  --parallelBuild=0|1|...   perform a parallel build
                             value = number of processors (0 for auto-detect)
   --verbosity:0|1|2|3       set Nimrod's verbosity level (0 is default)
   -v, --version             show detailed version information
diff --git a/data/basicopt.txt b/data/basicopt.txt
index af3f541ad..136c058c0 100755
--- a/data/basicopt.txt
+++ b/data/basicopt.txt
@@ -2,7 +2,7 @@ Usage::
   nimrod command [options] inputfile [arguments]
 Command::
   compile, c                compile project with default code generator (C)
-  compile_to_c, cc          compile project with C code generator
+  compileToC, cc            compile project with C code generator
   doc                       generate the documentation for inputfile
   rst2html                  converts a reStructuredText file to HTML
   rst2tex                   converts a reStructuredText file to TeX
@@ -13,19 +13,19 @@ Options:
   -o, --out:FILE            set the output filename
   -d, --define:SYMBOL       define a conditional symbol
   -u, --undef:SYMBOL        undefine a conditional symbol
-  -f, --force_build         force rebuilding of all modules
-  --symbol_files:on|off     use symbol files to speed up compilation (buggy!)
-  --stack_trace:on|off      code generation for stack trace ON|OFF
-  --line_trace:on|off       code generation for line trace ON|OFF
+  -f, --forceBuild          force rebuilding of all modules
+  --symbolFiles:on|off      use symbol files to speed up compilation (buggy!)
+  --stackTrace:on|off       code generation for stack trace ON|OFF
+  --lineTrace:on|off        code generation for line trace ON|OFF
   --debugger:on|off         turn Embedded Nimrod Debugger ON|OFF
   -x, --checks:on|off       code generation for all runtime checks ON|OFF
-  --obj_checks:on|off       code generation for obj conversion checks ON|OFF
-  --field_checks:on|off     code generation for case variant fields ON|OFF
-  --range_checks:on|off     code generation for range checks ON|OFF
-  --bound_checks:on|off     code generation for bound checks ON|OFF
-  --overflow_checks:on|off  code generation for over-/underflow checks ON|OFF
+  --objChecks:on|off        code generation for obj conversion checks ON|OFF
+  --fieldChecks:on|off      code generation for case variant fields ON|OFF
+  --rangeChecks:on|off      code generation for range checks ON|OFF
+  --boundChecks:on|off      code generation for bound checks ON|OFF
+  --overflowChecks:on|off   code generation for over-/underflow checks ON|OFF
   -a, --assertions:on|off   code generation for assertions ON|OFF
-  --dead_code_elim:on|off   whole program dead code elimination ON|OFF
+  --deadCodeElim:on|off     whole program dead code elimination ON|OFF
   --opt:none|speed|size     optimize not at all or for speed|size
   --app:console|gui|lib     generate a console|GUI application|dynamic library
   -r, --run                 run the compiled program with given arguments