[Mobies-commit] [commit] r4209 - UDM/trunk/src/UdmOclPat/GOCL/src/ANTLRBase

[endre at redhat3.isis.vanderbilt.edu]

Author: endre
Date: Sun Dec  8 03:36:42 2013
New Revision: 4209

Log:
MAC OS X compile issues

Modified:
   UDM/trunk/src/UdmOclPat/GOCL/src/ANTLRBase/AParser.cpp
   UDM/trunk/src/UdmOclPat/GOCL/src/ANTLRBase/AToken.h
   UDM/trunk/src/UdmOclPat/GOCL/src/ANTLRBase/ATokenBuffer.cpp
   UDM/trunk/src/UdmOclPat/GOCL/src/ANTLRBase/DLexerBase.cpp

Modified: UDM/trunk/src/UdmOclPat/GOCL/src/ANTLRBase/AParser.cpp
==============================================================================
--- UDM/trunk/src/UdmOclPat/GOCL/src/ANTLRBase/AParser.cpp	Fri Dec  6 14:09:40 2013	(r4208)
+++ UDM/trunk/src/UdmOclPat/GOCL/src/ANTLRBase/AParser.cpp	Sun Dec  8 03:36:42 2013	(r4209)
@@ -477,7 +477,7 @@
     va_start(ap, k);
 
     zzFAILtext[0] = '\0';
-	if ( k > SETWORDCOUNT ) panic("FAIL: overflowed buffer");
+	if ( k > SETWORDCOUNT ) panic((char*)"FAIL: overflowed buffer");
     for (i=1; i<=k; i++)    /* collect all lookahead sets */
     {
         f[i-1] = va_arg(ap, SetWordType *);

Modified: UDM/trunk/src/UdmOclPat/GOCL/src/ANTLRBase/AToken.h
==============================================================================
--- UDM/trunk/src/UdmOclPat/GOCL/src/ANTLRBase/AToken.h	Fri Dec  6 14:09:40 2013	(r4208)
+++ UDM/trunk/src/UdmOclPat/GOCL/src/ANTLRBase/AToken.h	Sun Dec  8 03:36:42 2013	(r4209)
@@ -147,7 +147,7 @@
 										  ANTLRChar *txt,
 										  int line)
 	{
-		panic("call to ANTLRRefCountToken::makeToken()\n");
+		panic((char *)"call to ANTLRRefCountToken::makeToken()\n");
 		return NULL;
 	}
 };
@@ -162,7 +162,7 @@
 	ANTLRCommonNoRefCountToken(ANTLRTokenType t, ANTLRChar *s)
 	{ setType(t); _line = 0; _text = NULL; setText(s); }
 	ANTLRCommonNoRefCountToken()
-	{ setType((ANTLRTokenType)0); _line = 0; _text = NULL; setText(""); }
+	{ setType((ANTLRTokenType)0); _line = 0; _text = NULL; setText((char*)""); }
 
 	~ANTLRCommonNoRefCountToken() { if (_text) delete [] _text; }  // MR9 RJV: Added Destructor to remove string
 
@@ -180,11 +180,11 @@
           if (_text) delete [] _text;
           if (s != NULL) {
          	_text = new ANTLRChar[strlen(s)+1];
-            if (_text == NULL) panic("ANTLRCommonNoRefCountToken::setText new failed");
+            if (_text == NULL) panic((char*)"ANTLRCommonNoRefCountToken::setText new failed");
             strcpy(_text,s);
     	  } else {
             _text = new ANTLRChar[1];
-            if (_text == NULL) panic("ANTLRCommonNoRefCountToken::setText new failed");
+            if (_text == NULL) panic((char*)"ANTLRCommonNoRefCountToken::setText new failed");
             strcpy(_text,"");
           };
         };
@@ -230,7 +230,7 @@
 	ANTLRCommonToken(ANTLRTokenType t, ANTLRChar *s) : ANTLRRefCountToken(t,s)
 		{ setType(t); _line = 0; _text = NULL; setText(s); }                    // MR9
 	ANTLRCommonToken()
-		{ setType((ANTLRTokenType)0); _line = 0; _text = NULL; setText(""); }   // MR9
+		{ setType((ANTLRTokenType)0); _line = 0; _text = NULL; setText((char*)""); }   // MR9
 
 	virtual ~ANTLRCommonToken() { if (_text) delete [] _text; } // MR9 RJV: Added Destructor to remove string
 
@@ -248,11 +248,11 @@
           if (_text) delete [] _text;
           if (s != NULL) {
          	_text = new ANTLRChar[strlen(s)+1];
-            if (_text == NULL) panic("ANTLRCommonToken::setText new failed");
+            if (_text == NULL) panic((char*)"ANTLRCommonToken::setText new failed");
             strcpy(_text,s);
     	  } else {
             _text = new ANTLRChar[1];
-            if (_text == NULL) panic("ANTLRCommonToken::setText new failed");
+            if (_text == NULL) panic((char*)"ANTLRCommonToken::setText new failed");
             strcpy(_text,"");
           };
         };

Modified: UDM/trunk/src/UdmOclPat/GOCL/src/ANTLRBase/ATokenBuffer.cpp
==============================================================================
--- UDM/trunk/src/UdmOclPat/GOCL/src/ANTLRBase/ATokenBuffer.cpp	Fri Dec  6 14:09:40 2013	(r4208)
+++ UDM/trunk/src/UdmOclPat/GOCL/src/ANTLRBase/ATokenBuffer.cpp	Sun Dec  8 03:36:42 2013	(r4209)
@@ -56,7 +56,7 @@
 	buffer = (_ANTLRTokenPtr *)
 			 calloc(chunk_size+1,sizeof(_ANTLRTokenPtr ));
 	if ( buffer == NULL ) {
-		panic("cannot alloc token buffer");
+		panic((char*)"cannot alloc token buffer");
 	}
 	buffer++;				// leave the first elem empty so tp-1 is valid ptr
 
@@ -306,7 +306,7 @@
 		realloc((char *)(buffer-1),
 				(buffer_size+1)*sizeof(_ANTLRTokenPtr ));
 	if ( buffer == NULL ) {
-		panic("cannot alloc token buffer");
+		panic((char*)"cannot alloc token buffer");
 	}
 	buffer++;				// leave the first elem empty so tp-1 is valid ptr
 

Modified: UDM/trunk/src/UdmOclPat/GOCL/src/ANTLRBase/DLexerBase.cpp
==============================================================================
--- UDM/trunk/src/UdmOclPat/GOCL/src/ANTLRBase/DLexerBase.cpp	Fri Dec  6 14:09:40 2013	(r4208)
+++ UDM/trunk/src/UdmOclPat/GOCL/src/ANTLRBase/DLexerBase.cpp	Sun Dec  8 03:36:42 2013	(r4209)
@@ -57,7 +57,7 @@
 	this->_bufsize = bufsize;
 	this->_lextext = new DLGChar[_bufsize];
 	if ( this->_lextext==NULL ) {
-	    panic("text buffer is NULL");
+	    panic((char*)"text buffer is NULL");
 	}
 	this->_begexpr = this->_endexpr = NULL;
 	this->ch = this->bufovf = 0;
@@ -206,7 +206,7 @@
 ANTLRTokenType DLGLexerBase::
 erraction()
 {
-	errstd("invalid token");
+	errstd((char*)"invalid token");
 	advance();
 	skip();
 	return (ANTLRTokenType) 0;	// bogus, but satisfies compiler
@@ -215,7 +215,7 @@
 _ANTLRTokenPtr DLGLexerBase::
 getToken()
 {
-	if ( token_to_fill==NULL ) panic("NULL token_to_fill");
+	if ( token_to_fill==NULL ) panic((char*)"NULL token_to_fill");
 	ANTLRTokenType tt = nextTokenType();
 	_ANTLRTokenPtr tk = token_to_fill->makeToken(tt, _lextext,_line);
 	return tk;