still on parser

examples/diameter/results/General-0.vci

-file 13724 1342196896                                           
+file 13724 1341907082                                           
 version 2
 run General-0-20120709-16:16:37-6492
 attr configname General

src/linklayer/lte/rrc/RRC.cc

@@ -32,6 +32,7 @@ RRC::~RRC() {
 }
 
 void RRC::initialize(int stage) {
+
 //	char lac[2] = {0x5b, 0x10};
 //	char tmsi[4] = {0x19, 0x02, 0x2c, 0xba};
 //	std::vector<unsigned char> mcc;

src/linklayer/lte/rrc/RRC.h

@@ -19,7 +19,9 @@
 #define RRC_H_
 
 #include <omnetpp.h>
-//#include "RRCPDUDefinitions.h"
+#include "RRCClassDefinitions.h"
+
+using namespace rrc;
 
 class RRC : public cSimpleModule {
 public:

src/linklayer/lte/rrc/message/RRCClassDefinitions.cc

@@ -17,7 +17,7 @@
 
 #include "RRCClassDefinitions.h"
 
-namespace rrcNamespace {
+namespace rrc {
 
 const void *DLDCCHMessageType::choicesInfo[32] = {
 	&ActiveSetUpdate::theInfo,

src/linklayer/lte/rrc/message/RRCClassDefinitions.h

@@ -22,7 +22,7 @@
 #include "RRCPDUDefinitions.h"
 #include "RRCInformationElements.h"
 
-namespace rrcNamespace {
+namespace rrc {
 
 typedef Null DLDCCHMessageTypeSpare3;
 

src/linklayer/lte/rrc/message/RRCConstantDefinitions.cc

@@ -17,6 +17,6 @@
 
 #include "RRCConstantDefinitions.h"
 
-namespace rrcNamespace {
+namespace rrc {
 
 }

src/linklayer/lte/rrc/message/RRCConstantDefinitions.h

@@ -20,7 +20,7 @@
 
 #include "ASNTypes.h"
 
-namespace rrcNamespace {
+namespace rrc {
 
 #define hiPDSCHidentities 64
 

src/linklayer/lte/rrc/message/RRCPDUDefinitions.cc

@@ -17,7 +17,7 @@
 
 #include "RRCPDUDefinitions.h"
 
-namespace rrcNamespace {
+namespace rrc {
 
 const void *ActiveSetUpdater3IEs::itemsInfo[12] = {
 	&RRCTransactionIdentifier::theInfo,

src/linklayer/lte/rrc/message/RRCPDUDefinitions.h

@@ -22,7 +22,7 @@
 #include "RRCInformationElements.h"
 #include "RRCConstantDefinitions.h"
 
-namespace rrcNamespace {
+namespace rrc {
 
 class ActiveSetUpdater3IEs : Sequence {
 private:

src/util/asn/parser/asnparser.py

@@ -285,6 +285,7 @@ def parsestring(string):
 
                 if asnobj.constrainttype == "UNCONSTRAINED" and asnobj.type in constrainttypes:
                         asnobj.type += "Base"
+
 	return asnobj
 	
 def printobjects(asnobjs):
@@ -325,6 +326,12 @@ def writeobject(asnobj, hdrfile, srcfile):
 		if asnobj.parent != None:
 			asnobj.name = asnobj.parent.name + asnobj.name
 
+		if asnobj.name == module:
+                        asnobj.name = asnobj.name + "_"
+
+                if asnobj.type == module:
+                        asnobj.type = asnobj.type + "_"
+
                 # Non standard types
 
 		if asnobj.type not in types:
@@ -512,8 +519,8 @@ def writefile(filename):
 
 	srcfile.write("#include \"" + outfilename + ".h\"\n\n")
 
-	srcfile.write("namespace " + module.lower() + "Namespace {\n\n")
-	hdrfile.write("namespace " + module.lower() + "Namespace {\n\n")
+	srcfile.write("namespace " + module.lower() + " {\n\n")
+	hdrfile.write("namespace " + module.lower() + " {\n\n")
 
 	for i in range (0, len(asnobjs)):
 		asnobj = asnobjs[i]