Scanner-based parsing with support for element erasing

Also implement argv_file_scanner which provides support for reading command
line arguments from the argv array as well as files specified with command
line options. New examples: file. New tests: ctor, erase, file.

3 files changed, 118 insertions, 0 deletions

diff --git a/tests/erase/driver.cxx b/tests/erase/driver.cxx
new file mode 100644
index 0000000..ddb6b8d
--- /dev/null
+++ b/tests/erase/driver.cxx
@@ -0,0 +1,35 @@
+// file      : tests/erase/driver.cxx
+// author    : Boris Kolpackov <boris@codesynthesis.com>
+// copyright : Copyright (c) 2009 Code Synthesis Tools CC
+// license   : MIT; see accompanying LICENSE file
+
+// Test argument erasing.
+//
+
+#include <string>
+#include <cassert>
+
+#include "test.hxx"
+
+using namespace std;
+
+int
+main (int argc, char* argv[])
+{
+  options o (argc, argv, true,
+             cli::unknown_mode::skip,
+             cli::unknown_mode::skip);
+
+  assert (o.a ());
+  assert (o.b () == 123);
+
+  // We should have 'foo bar --arg -- -b 234'.
+  //
+  assert (argc == 7);
+  assert (argv[1] == string ("foo"));
+  assert (argv[2] == string ("bar"));
+  assert (argv[3] == string ("--arg"));
+  assert (argv[4] == string ("--"));
+  assert (argv[5] == string ("-b"));
+  assert (argv[6] == string ("234"));
+}
diff --git a/tests/erase/makefile b/tests/erase/makefile
new file mode 100644
index 0000000..5a8f49a
--- /dev/null
+++ b/tests/erase/makefile
@@ -0,0 +1,73 @@
+# file      : tests/erase/makefile
+# author    : Boris Kolpackov <boris@codesynthesis.com>
+# copyright : Copyright (c) 2009 Code Synthesis Tools CC
+# license   : MIT; see accompanying LICENSE file
+
+include $(dir $(lastword $(MAKEFILE_LIST)))../../build/bootstrap.make
+
+cxx_tun := driver.cxx
+cli_tun := test.cli
+
+#
+#
+cxx_obj  := $(addprefix $(out_base)/,$(cxx_tun:.cxx=.o) $(cli_tun:.cli=.o))
+cxx_od   := $(cxx_obj:.o=.o.d)
+
+driver   := $(out_base)/driver
+test     := $(out_base)/.test
+clean    := $(out_base)/.clean
+
+# Build.
+#
+$(driver): $(cxx_obj)
+$(cxx_obj) $(cxx_od): cpp_options := -I$(out_base)
+
+genf := $(cli_tun:.cli=.hxx) $(cli_tun:.cli=.ixx) $(cli_tun:.cli=.cxx)
+gen  := $(addprefix $(out_base)/,$(genf))
+
+$(gen): $(out_root)/cli/cli
+$(gen): cli := $(out_root)/cli/cli
+$(gen): cli_options :=
+
+$(call include-dep,$(cxx_od),$(cxx_obj),$(gen))
+
+# Alias for default target.
+#
+$(out_base)/: $(driver)
+
+# Test.
+#
+$(test): driver := $(driver)
+$(test): $(driver)
+	$(call message,test $$1,$$1 foo -a bar -b 123 --arg -- -b 234,$(driver))
+
+# Clean.
+#
+$(clean):                            \
+  $(driver).o.clean                  \
+  $(addsuffix .cxx.clean,$(cxx_obj)) \
+  $(addsuffix .cxx.clean,$(cxx_od))  \
+  $(addprefix $(out_base)/,$(cli_tun:.cli=.cxx.cli.clean))
+
+# Generated .gitignore.
+#
+ifeq ($(out_base),$(src_base))
+$(driver): | $(out_base)/.gitignore
+
+$(out_base)/.gitignore: files := driver $(genf)
+$(clean): $(out_base)/.gitignore.clean
+
+$(call include,$(bld_root)/git/gitignore.make)
+endif
+
+# How to.
+#
+$(call include,$(bld_root)/cxx/o-e.make)
+$(call include,$(bld_root)/cxx/cxx-o.make)
+$(call include,$(bld_root)/cxx/cxx-d.make)
+$(call include,$(scf_root)/cli/cli-cxx.make)
+
+# Dependencies.
+#
+$(call import,$(src_root)/cli/makefile)
+
diff --git a/tests/erase/test.cli b/tests/erase/test.cli
new file mode 100644
index 0000000..57820c0
--- /dev/null
+++ b/tests/erase/test.cli
@@ -0,0 +1,10 @@
+// file      : tests/erase/test.cli
+// author    : Boris Kolpackov <boris@codesynthesis.com>
+// copyright : Copyright (c) 2009 Code Synthesis Tools CC
+// license   : MIT; see accompanying LICENSE file
+
+class options
+{
+  bool -a;
+  int -b;
+};