From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 15 Mar 2019 04:43:41 +0000 (+0000)
Subject: libpakfire: parser: Rename T_NEWLINE to T_EOL
X-Git-Tag: 0.9.28~1285^2~1047
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=16158fa6e2ba1369d3d164fc4151a52915331f10;p=pakfire.git

libpakfire: parser: Rename T_NEWLINE to T_EOL

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/src/libpakfire/parser/grammar.y b/src/libpakfire/parser/grammar.y
index 0daf8ad06..6f193746f 100644
--- a/src/libpakfire/parser/grammar.y
+++ b/src/libpakfire/parser/grammar.y
@@ -68,7 +68,7 @@ char* current_block = NULL;
 %token							T_END
 %token <string>					T_EQUALS
 %token <string>					T_IF
-%token							T_NEWLINE
+%token							T_EOL
 %token <string>					T_WORD
 
 %type <string>					define;
@@ -99,7 +99,7 @@ thing						: assignment
 							| empty
 							;
 
-empty						: T_NEWLINE
+empty						: T_EOL
 							;
 
 variable					: T_WORD;
@@ -124,12 +124,12 @@ words						: word
 								}
 							};
 
-line						: words T_NEWLINE
+line						: words T_EOL
 							{
 								// Only forward words
 								$$ = $1;
 							}
-							| T_NEWLINE {
+							| T_EOL {
 								$$ = NULL;
 							};
 
@@ -144,17 +144,17 @@ text						: text line
 							| line
 							;
 
-if_stmt						: T_IF T_WORD T_EQUALS T_WORD T_NEWLINE block_assignments end
+if_stmt						: T_IF T_WORD T_EQUALS T_WORD T_EOL block_assignments end
 							{
 								printf("IF STATEMENT NOT EVALUATED, YET: %s %s\n", $2, $4);
 							};
 
-block_opening				: variable T_NEWLINE
+block_opening				: variable T_EOL
 							{
 								current_block = pakfire_strdup($1);
 							};
 
-block_closing				: T_END T_NEWLINE
+block_closing				: T_END T_EOL
 							{
 								pakfire_free(current_block);
 								current_block = NULL;
@@ -169,13 +169,13 @@ block_assignment			: assignment
 							| if_stmt
 							| empty;
 
-assignment					: variable T_ASSIGN value T_NEWLINE
+assignment					: variable T_ASSIGN value T_EOL
 							{
 								int r = pakfire_parser_add_declaration(pakfire, declarations, $1, $3);
 								if (r < 0)
 									ABORT;
 							}
-							| variable T_APPEND value T_NEWLINE
+							| variable T_APPEND value T_EOL
 							{
 								int r = pakfire_parser_append_declaration(pakfire, declarations, $1, $3);
 								if (r < 0)
@@ -188,16 +188,16 @@ assignment					: variable T_ASSIGN value T_NEWLINE
 									ABORT;
 							};
 
-define						: T_DEFINE variable T_NEWLINE
+define						: T_DEFINE variable T_EOL
 							{
 								$$ = $2;
 							}
-							| variable T_NEWLINE
+							| variable T_EOL
 							{
 								$$ = $1;
 							};
 
-end							: T_END T_NEWLINE;
+end							: T_END T_EOL;
 
 %%
 
diff --git a/src/libpakfire/parser/scanner.l b/src/libpakfire/parser/scanner.l
index cb41d5b32..c746142eb 100644
--- a/src/libpakfire/parser/scanner.l
+++ b/src/libpakfire/parser/scanner.l
@@ -43,7 +43,7 @@ word			({quoted_string}|({digit}|{letter}|{special})+)
 
 #.*$			{ /* ignore comments */ }
 {whitespace}	{}
-\n				{ num_lines++; return T_NEWLINE; }
+\n				{ num_lines++; return T_EOL; }
 
 "=="			{ return T_EQUALS; }
 "="				{ return T_ASSIGN; }