Restore ANJUTA_TOKEN_VARIABLE to avoid a crash with autotools project

sgranjoux · Oct 14, 2009 · 2ba01da · 2ba01da
1 parent 25d5cbe
commit 2ba01da
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 6 deletions.
diff --git a/libanjuta/anjuta-token.c b/libanjuta/anjuta-token.c
@@ -292,7 +292,7 @@ anjuta_token_evaluate_token (AnjutaToken *token, GString *value, gboolean raw)
 			case ANJUTA_TOKEN_OPEN_QUOTE:
 			case ANJUTA_TOKEN_CLOSE_QUOTE:
 			case ANJUTA_TOKEN_ESCAPE:
-			case ANJUTA_TOKEN_VARIABLE:
+			case ANJUTA_TOKEN_MACRO:
 			case ANJUTA_TOKEN_EOV:
 				return;
 			default:

diff --git a/libanjuta/anjuta-token.h b/libanjuta/anjuta-token.h
@@ -35,14 +35,14 @@ typedef enum
 
 	ANJUTA_TOKEN_FIRST								= 16384,	
 	ANJUTA_TOKEN_FILE,
-	ANJUTA_TOKEN_VARIABLE,
+	ANJUTA_TOKEN_MACRO,
 	ANJUTA_TOKEN_EOV,
 	ANJUTA_TOKEN_PARSED,
 	ANJUTA_TOKEN_KEYWORD,
 	ANJUTA_TOKEN_OPERATOR,
 	ANJUTA_TOKEN_NAME,
 	ANJUTA_TOKEN_VALUE,
-	ANJUTA_TOKEN_MACRO,
+	ANJUTA_TOKEN_VARIABLE,
 	ANJUTA_TOKEN_DEFINITION,
 	ANJUTA_TOKEN_STATEMENT,
 	ANJUTA_TOKEN_NUMBER,

diff --git a/src/mk-project.c b/src/mk-project.c
@@ -980,7 +980,7 @@ mkp_project_token_evaluate_token (MkpProject *project, AnjutaToken *token, GStri
 		case ANJUTA_TOKEN_OPEN_QUOTE:
 		case ANJUTA_TOKEN_CLOSE_QUOTE:
 		case ANJUTA_TOKEN_ESCAPE:
-		case ANJUTA_TOKEN_VARIABLE:
+		case ANJUTA_TOKEN_MACRO:
 		case ANJUTA_TOKEN_EOV:
 			break;
 		/*case MK_TOKEN_VARIABLE:

diff --git a/src/mk-scanner.l b/src/mk-scanner.l
@@ -274,7 +274,7 @@ mkp_scanner_parse_variable (MkpScanner *scanner, AnjutaToken *variable)
 
     if (token != NULL)
     {
-        anjuta_token_set_type (variable, ANJUTA_TOKEN_VARIABLE);
+        anjuta_token_set_type (variable, ANJUTA_TOKEN_MACRO);
         token = anjuta_token_copy (token);
         anjuta_token_insert_after (variable, token);
 

diff --git a/tests/makefile.lst b/tests/makefile.lst
@@ -1,3 +1,9 @@
+    VARIABLE: CFLAGS =  -g -Wall
+    VARIABLE: OBJECTS =  foobar.o
+    VARIABLE: LDFLAGS =  -Wl,-rpath,/usr/local/lib
+    VARIABLE: CC =  gcc
+    VARIABLE: LIBS = (null)
+    VARIABLE: INCFLAGS = (null)
     GROUP (0): makefile
-        TARGET (0:0): foorbar
+        TARGET (0:0): foobar
             SOURCE (0:0:0): foobar.c