diff --git a/elab_sig.cc b/elab_sig.cc
index a469450a4..46344b739 100644
--- a/elab_sig.cc
+++ b/elab_sig.cc
@@ -17,7 +17,7 @@
  *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
 #if !defined(WINNT) && !defined(macintosh)
-#ident "$Id: elab_sig.cc,v 1.12 2001/02/17 05:15:33 steve Exp $"
+#ident "$Id: elab_sig.cc,v 1.13 2001/05/25 02:21:34 steve Exp $"
 #endif
 
 # include  "Module.h"
@@ -88,6 +88,32 @@ bool Module::elaborate_sig(Design*des, NetScope*scope) const
 			des->errors += 1;
 		  }
 	    }
+
+	      /* If the signal is an input and is also declared as a
+		 reg, then report an error. */
+
+	    if (sig && (sig->scope() == scope)
+		&& (sig->port_type() == NetNet::PINPUT)
+		&& (sig->type() == NetNet::REG)) {
+
+		  cerr << cur->get_line() << ": error: "
+		       << cur->name() << " in module "
+		       << scope->module_name()
+		       << " declared as input and as a reg type." << endl;
+		  des->errors += 1;
+	    }
+
+	    if (sig && (sig->scope() == scope)
+		&& (sig->port_type() == NetNet::PINOUT)
+		&& (sig->type() == NetNet::REG)) {
+
+		  cerr << cur->get_line() << ": error: "
+		       << cur->name() << " in  module "
+		       << scope->module_name()
+		       << " declared as inout and as a reg type." << endl;
+		  des->errors += 1;
+	    }
+
       }
 
 	// Get all the gates of the module and elaborate them by
@@ -414,6 +440,9 @@ void PWire::elaborate_sig(Design*des, NetScope*scope) const
 
 /*
  * $Log: elab_sig.cc,v $
+ * Revision 1.13  2001/05/25 02:21:34  steve
+ *  Detect input and input ports declared as reg.
+ *
  * Revision 1.12  2001/02/17 05:15:33  steve
  *  Allow task ports to be given real types.
  *
diff --git a/pform.cc b/pform.cc
index 314f95dbf..49ce51283 100644
--- a/pform.cc
+++ b/pform.cc
@@ -17,7 +17,7 @@
  *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
 #if !defined(WINNT) && !defined(macintosh)
-#ident "$Id: pform.cc,v 1.76 2001/05/20 15:03:25 steve Exp $"
+#ident "$Id: pform.cc,v 1.77 2001/05/25 02:21:34 steve Exp $"
 #endif
 
 # include  "compiler.h"
@@ -625,6 +625,24 @@ void pform_make_reginit(const struct vlltype&li,
       pform_cur_module->add_behavior(top);
 }
 
+/*
+ * This function makes a single signal (a wire, a reg, etc) as
+ * requested by the parser. The name is unscoped, so I attach the
+ * current scope to it (with the scoped_name function) and I try to
+ * resolve it with an existing PWire in the scope.
+ *
+ * The wire might already exist because of an implicit declaration in
+ * a module port, i.e.:
+ *
+ *     module foo (bar...
+ *
+ *         reg bar;
+ *
+ * The output (or other port direction indicator) may or may not have
+ * been seen already, so I do not do any cheching with it yet. But I
+ * do check to see if the name has already been declared, as this
+ * function is called for every declaration.
+ */
 void pform_makewire(const vlltype&li, const string&nm,
 		    NetNet::Type type)
 {
@@ -647,6 +665,9 @@ void pform_makewire(const vlltype&li, const string&nm,
 			VLerror(msg.str());
 		  }
 	    }
+
+	    cur->set_file(li.text);
+	    cur->set_lineno(li.first_line);
 	    return;
       }
 
@@ -996,6 +1017,9 @@ int pform_parse(const char*path, map<string,Module*>&modules,
 
 /*
  * $Log: pform.cc,v $
+ * Revision 1.77  2001/05/25 02:21:34  steve
+ *  Detect input and input ports declared as reg.
+ *
  * Revision 1.76  2001/05/20 15:03:25  steve
  *  Deleted wrong time when -Tmax is selected.
  *