From f9c1cd5edba5acb4d9b9dd287c7265111cf22087 Mon Sep 17 00:00:00 2001
From: Clifford Wolf <clifford@clifford.at>
Date: Wed, 4 Jun 2014 09:10:50 +0200
Subject: [PATCH] Improved error message for options after front-end filename
 arguments

---
 frontends/verilog/verilog_frontend.cc | 2 +-
 kernel/register.cc                    | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/frontends/verilog/verilog_frontend.cc b/frontends/verilog/verilog_frontend.cc
index 8e9efa173..108214586 100644
--- a/frontends/verilog/verilog_frontend.cc
+++ b/frontends/verilog/verilog_frontend.cc
@@ -48,7 +48,7 @@ struct VerilogFrontend : public Frontend {
 	{
 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
 		log("\n");
-		log("    read_verilog [filename]\n");
+		log("    read_verilog [options] [filename]\n");
 		log("\n");
 		log("Load modules from a verilog file to the current design. A large subset of\n");
 		log("Verilog-2005 is supported.\n");
diff --git a/kernel/register.cc b/kernel/register.cc
index 5d882ab43..8da5a725f 100644
--- a/kernel/register.cc
+++ b/kernel/register.cc
@@ -270,6 +270,10 @@ void Frontend::extra_args(FILE *&f, std::string &filename, std::vector<std::stri
 		if (f == NULL)
 			log_cmd_error("Can't open input file `%s' for reading: %s\n", filename.c_str(), strerror(errno));
 
+		for (size_t i = argidx+1; i < args.size(); i++)
+			if (args[i].substr(0, 1) == "-")
+				cmd_error(args, i, "Found option, expected arguments.");
+
 		if (argidx+1 < args.size()) {
 			next_args.insert(next_args.begin(), args.begin(), args.begin()+argidx);
 			next_args.insert(next_args.begin()+argidx, args.begin()+argidx+1, args.end());
-- 
2.30.2