One write of AC_INIT

sgranjoux · Nov 8, 2009 · b122ff2 · b122ff2
1 parent b5dcff1
commit b122ff2
Show file tree

Hide file tree

Showing 13 changed files with 318 additions and 93 deletions.
diff --git a/libanjuta/anjuta-token-file.c b/libanjuta/anjuta-token-file.c
@@ -218,6 +218,94 @@ anjuta_token_file_get_file (AnjutaTokenFile *file)
 	return file->file;
 }
 
+/**
+ * anjuta_token_file_update:
+ * @file: a #AnjutaTokenFile derived class object.
+ * @token: Token to update.
+ * 
+ * Update the file with all changed token starting from @token. The function can
+ * return an error if the token is not in the file.
+ * 
+ * Return value: TRUE is the update is done without error.
+ */
+gboolean
+anjuta_token_file_update (AnjutaTokenFile *file, AnjutaToken *token)
+{
+	AnjutaToken *prev;
+	AnjutaToken *start = NULL;
+	AnjutaToken *next;
+	const gchar *pos;
+	const gchar *ptr;
+	const gchar *last;
+	const gchar *end;
+
+	/* Find position a token in the file */
+	for (prev = token; prev != NULL; prev = anjuta_token_previous_sibling (prev))
+	{
+		if (anjuta_token_get_string (prev) != NULL)
+		{
+			gint flags = anjuta_token_get_flags (prev);
+			if (!(flags & (ANJUTA_TOKEN_ADDED | ANJUTA_TOKEN_REMOVED))) break;
+			token = prev;    
+		}
+	}	
+
+	/* Find token position */
+	if (prev != NULL)
+	{
+		pos = anjuta_token_get_string (prev);
+		for (start = file->content; start != NULL; start = anjuta_token_next (start))
+		{
+			guint len = anjuta_token_get_length (start);
+
+			if (len)
+			{
+				ptr = anjuta_token_get_string (start);
+				end = ptr + len;
+
+				if ((pos >= ptr) && (pos < end)) break;
+			}
+		}
+		if (ptr != pos)
+		{
+			start = anjuta_token_split (start, ptr - pos);
+			start = anjuta_token_next (start);
+		}
+	}
+
+	/* Updated token */
+	last = pos;
+	for (next = token; next != NULL; next = anjuta_token_next_sibling (next))
+	{
+		gint flags = anjuta_token_get_flags (next);
+
+		if (flags & ANJUTA_TOKEN_REMOVED)
+		{
+			guint len = anjuta_token_get_length (next);
+		}
+		else if (flags & ANJUTA_TOKEN_ADDED)
+		{
+			AnjutaToken* copy = anjuta_token_copy_token (next);
+
+			if (start == NULL)
+			{
+				start = anjuta_token_insert_child (file->content, copy);
+			}
+			else
+			{
+				start = anjuta_token_insert_after (start, copy);
+			}
+		}
+		else
+		{
+			break;
+		}
+	}
+
+	return TRUE;
+}
+
+
 /* GObject functions
  *---------------------------------------------------------------------------*/
 

diff --git a/libanjuta/anjuta-token-file.h b/libanjuta/anjuta-token-file.h
@@ -56,6 +56,8 @@ void anjuta_token_file_move (AnjutaTokenFile *file, GFile *new_file);
 
 gboolean anjuta_token_file_get_token_location (AnjutaTokenFile *file, AnjutaTokenFileLocation *location, AnjutaToken *token);
 
+gboolean anjuta_token_file_update (AnjutaTokenFile *file, AnjutaToken *token);
+
 AnjutaToken* anjuta_token_file_get_content (AnjutaTokenFile *file);
 GFile *anjuta_token_file_get_file (AnjutaTokenFile *file);
 

diff --git a/libanjuta/anjuta-token-style.c b/libanjuta/anjuta-token-style.c
@@ -305,29 +305,31 @@ anjuta_token_list_first (AnjutaToken *list)
 {
 	AnjutaToken *token;
 
-	token = anjuta_token_next_child (list);
-	if (token == NULL) return token;
-
-	if (anjuta_token_get_type (token) == ANJUTA_TOKEN_START)
+	for (token = list; token != NULL; token = anjuta_token_next (token))
 	{
-		token = anjuta_token_next_sibling (token);
+		if (anjuta_token_get_type (token) == ANJUTA_TOKEN_START)
+		{
+			return token;
+		}
 	}
 
-	return token;
+	return NULL;
 }
 
 AnjutaToken *
 anjuta_token_list_last (AnjutaToken *list)
 {
 	AnjutaToken *token;
 
-	token = anjuta_token_list_first (list);
-	for (;;)
+	for (token = list; token != NULL; token = anjuta_token_next (token))
 	{
-		AnjutaToken *next = anjuta_token_list_next (list);
-		if (next == NULL) return token;
-		token = next;
+		if (anjuta_token_get_type (token) == ANJUTA_TOKEN_LAST)
+		{
+			return token;
+		}
 	}
+
+	return NULL;
 }
 
 AnjutaToken *
@@ -347,23 +349,31 @@ anjuta_token_list_next (AnjutaToken *sibling)
 }
 
 AnjutaToken *
-anjuta_token_list_replace (AnjutaToken *sibling, AnjutaToken *baby)
+anjuta_token_list_replace (AnjutaToken *sibling, AnjutaToken *token)
 {
-	AnjutaToken *token;
-
-	token = anjuta_token_insert_before (sibling, baby);
-	if ((anjuta_token_get_type (sibling) != ANJUTA_TOKEN_NEXT) && (anjuta_token_get_type (sibling) != ANJUTA_TOKEN_LAST))
+	for (;; sibling = anjuta_token_next (sibling))
 	{
-		anjuta_token_remove (sibling);
+		switch (anjuta_token_get_type (sibling))
+		{
+		case ANJUTA_TOKEN_NEXT:
+		case ANJUTA_TOKEN_LAST:
+			break;
+		default:
+			anjuta_token_remove (sibling);
+			continue;
+		}
+		break;
 	}
+	token = anjuta_token_insert_before (sibling, token);
 
 	return token;
 }
 
 AnjutaToken *
-anjuta_token_list_replace_nth (AnjutaToken *list, guint n, AnjutaToken *baby)
+anjuta_token_list_replace_nth (AnjutaToken *list, guint n, AnjutaToken *item)
 {
 	AnjutaToken *token;
+	gboolean no_item = TRUE;
 
 	token = anjuta_token_list_first (list); 
 	if (token == NULL)
@@ -372,31 +382,28 @@ anjuta_token_list_replace_nth (AnjutaToken *list, guint n, AnjutaToken *baby)
 		token = anjuta_token_insert_after (token, anjuta_token_new_static (ANJUTA_TOKEN_LAST | ANJUTA_TOKEN_ADDED, NULL));
 	}
 
-	for (; n != 0; n--)
+	for (n++; n == 0;)
 	{
 		AnjutaToken *next;
 
 		switch (anjuta_token_get_type (token))
 		{
-			case ANJUTA_TOKEN_LAST:
-				anjuta_token_insert_before (token, anjuta_token_new_static (ANJUTA_TOKEN_NEXT | ANJUTA_TOKEN_ADDED, NULL));
-				continue;
-			case ANJUTA_TOKEN_NEXT:
-				break;
-			default:
-				token = anjuta_token_next_sibling (token);
-				if (token == NULL)
-				{
-					token = anjuta_token_insert_after (token, anjuta_token_new_static (ANJUTA_TOKEN_NEXT | ANJUTA_TOKEN_ADDED, NULL));
-				}
-				else if (anjuta_token_get_type (token) == ANJUTA_TOKEN_LAST)
-				{
-					token = anjuta_token_insert_before (token, anjuta_token_new_static (ANJUTA_TOKEN_NEXT | ANJUTA_TOKEN_ADDED, NULL));
-				}
-				break;
+		case ANJUTA_TOKEN_LAST:
+			anjuta_token_insert_before (token, anjuta_token_new_static (ANJUTA_TOKEN_NEXT | ANJUTA_TOKEN_ADDED, NULL));
+			continue;
+		case ANJUTA_TOKEN_NEXT:
+			if (no_item) n--;
+			no_item = TRUE;
+			break;
+		case ANJUTA_TOKEN_ITEM:
+			n--;
+			no_item = FALSE;
+			break;
+		default:
+			break;
 		}
 
-		next = anjuta_token_next_sibling (token);
+		next = anjuta_token_next (token);
 		if (next == NULL)
 		{
 			token = anjuta_token_insert_after (token, anjuta_token_new_static (ANJUTA_TOKEN_LAST | ANJUTA_TOKEN_ADDED, NULL));
@@ -407,7 +414,7 @@ anjuta_token_list_replace_nth (AnjutaToken *list, guint n, AnjutaToken *baby)
 		}
 	}
 
-	return anjuta_token_list_replace (token, baby); 
+	return anjuta_token_list_replace (token, item); 
 }
 
 AnjutaToken *

diff --git a/libanjuta/anjuta-token.c b/libanjuta/anjuta-token.c
@@ -536,7 +536,16 @@ anjuta_token_insert_after (AnjutaToken *sibling, AnjutaToken *token)
 AnjutaToken *
 anjuta_token_insert_before (AnjutaToken *sibling, AnjutaToken *baby)
 {
-	return (AnjutaToken *)g_node_insert_before ((GNode *)sibling->parent, (GNode *)sibling, (GNode *)baby);
+	AnjutaToken *next = NULL;
+	AnjutaToken *token;
+
+	for (token = baby; token != NULL; token = next)
+	{
+		next = anjuta_token_next (token);
+		g_node_insert_before ((GNode *)sibling->parent, (GNode *)sibling, (GNode *)token);
+	}
+
+	return baby;
 }	
 
 void

diff --git a/src/ac-parser.y b/src/ac-parser.y
@@ -30,6 +30,7 @@
 /* Token location is found directly from token value, there is no need to
  * maintain a separate location variable */
 #define YYLLOC_DEFAULT(Current, Rhs, N)	((Current) = YYRHSLOC(Rhs, (N) ? 1 : 0))
+
 %}
 
 %union {
@@ -52,7 +53,8 @@
 %token  <token> COMMA             ','
 %token  <token> LOWER           '<'
 %token  <token> GREATER         '>'
-
+
+%token  <token> COMMENT
 %token  <token> NAME
 %token  <token> VARIABLE
 %token  <token> MACRO
@@ -221,7 +223,7 @@ ac_macro_with_arg:
 
 ac_init:
     AC_INIT arg_list {
-        amp_ac_scanner_load_properties (scanner, $2);
+        amp_ac_scanner_load_properties (scanner, $1, $2);
     }
 
 ac_output:

diff --git a/src/ac-scanner.h b/src/ac-scanner.h
@@ -39,7 +39,7 @@ AnjutaToken* amp_ac_scanner_parse_token (AmpAcScanner *scanner, AnjutaToken *tok
 
 void amp_ac_scanner_load_module (AmpAcScanner *scanner, AnjutaTokenGroup *module);
 void amp_ac_scanner_load_config (AmpAcScanner *scanner, AnjutaTokenGroup *list);
-void amp_ac_scanner_load_properties (AmpAcScanner *scanner, AnjutaTokenGroup *list);
+void amp_ac_scanner_load_properties (AmpAcScanner *scanner, AnjutaToken *macro, AnjutaTokenGroup *args);
 
 void amp_ac_yyerror (YYLTYPE *loc, AmpAcScanner *scanner, char const *s);
 
@@ -52,7 +52,8 @@ enum
 	AC_TOKEN_AC_OUTPUT,
 	AC_TOKEN_SPACE_LIST,
 	AC_TOKEN_OPEN_STRING,
-	AC_TOKEN_CLOSE_STRING
+	AC_TOKEN_CLOSE_STRING,
+	AC_TOKEN_AC_PREREQ,
 };
 
 enum

diff --git a/src/ac-scanner.l b/src/ac-scanner.l
@@ -362,9 +362,9 @@ amp_ac_scanner_load_config (AmpAcScanner *scanner, AnjutaTokenGroup *list)
 }
 
 void
-amp_ac_scanner_load_properties (AmpAcScanner *scanner, AnjutaTokenGroup *list)
+amp_ac_scanner_load_properties (AmpAcScanner *scanner, AnjutaToken *macro, AnjutaTokenGroup *list)
 {
-    amp_project_load_properties (scanner->project, list);
+    amp_project_load_properties (scanner->project, macro, list);
 }