Support full arvelie format. Fix XXIIVV#62

src/helpers.h

@@ -241,4 +241,4 @@ fputcent(FILE *f, char c)
 		fputs("&", f);
 	else
 		fputc(c, f);
-}
+}

src/projects/arvelie/arvelie.h

@@ -54,6 +54,22 @@ is_valid_arvelie(char* date)
 	return 1;
 }
 
+int
+is_full_valid_arvelie(char* date)
+{
+	int y = (date[0] - '0') * 1000 + (date[1] - '0') * 100 +
+	        (date[2] - '0') * 10 + date[3] - '0';
+	int m = date[4] - 'A';
+	int d = ((date[5] - '0') * 10) + date[6] - '0';
+	if(slen(date) != 7) {
+		return 0;
+	}
+	if(y < 0 || y > 9999 || m < 0 || m > 26 || d < 0 || d > 14) {
+		return 0;
+	}
+	return 1;
+}
+
 int
 is_valid_ymdstr(char* date)
 {
@@ -81,6 +97,15 @@ arvelie_to_doty(char* date)
 	return doty == -307 ? 364 : doty;
 }
 
+int
+full_arvelie_to_doty(char* date)
+{
+	int m = date[4] - 'A';
+	int d = ((date[5] - '0') * 10) + date[6] - '0';
+	int doty = (m * 14) + d;
+	return doty == -307 ? 364 : doty;
+}
+
 int
 arvelie_to_epoch(char* date)
 {
@@ -146,7 +171,11 @@ print_arvelie_from_doty(int y, int doty)
 	                  "S", "T", "U", "V", "W", "X", "Y", "Z", "+"};
 	int d = (doty % 14) + 1;
 	char* m = months[doty / 14];
-	printf("%d%s%02d\n", y % 100, m, d);
+	if(y >= 2000 && y < 3000) {
+		printf("%d%s%02d\n", y % 100, m, d);
+	} else {
+		printf("%d%s%02d\n", y, m, d);
+	}
 }
 
 void
@@ -186,6 +215,18 @@ print_ymdstr_from_arvelie(char* date)
 	return 0;
 }
 
+print_ymdstr_from_full_arvelie(char* date)
+{
+	int y = (date[0] - '0') * 1000 + (date[1] - '0') * 100 +
+	        (date[2] - '0') * 10 + date[3] - '0';
+	if(!is_full_valid_arvelie(date)) {
+		printf("Error: Invalid arvelie date\n");
+		return 1;
+	}
+	print_ymdstr_from_doty(y, full_arvelie_to_doty(date));
+	return 0;
+}
+
 void
 print_arvelie(void)
 {

src/projects/arvelie/build.sh

@@ -8,8 +8,10 @@ cc -std=c89 -DDEBUG -Wall -Wpedantic -Wshadow -Wextra -Werror=implicit-int -Werr
 
 echo "Valid:"
 ./arvelie
+./arvelie 2020-10-27
 ./arvelie 1986-03-22
 ./arvelie 19Q13
+./arvelie 1919Q13
 
 echo "Errors:"
 ./arvelie 2020-04-AG

src/projects/arvelie/main.c

@@ -19,6 +19,8 @@ main(int argc, char* argv[])
 			print_arvelie_from_ymdstr(argv[1]);
 		else if(slen(argv[1]) == 5)
 			print_ymdstr_from_arvelie(argv[1]);
+		else if(slen(argv[1]) == 7)
+			print_ymdstr_from_full_arvelie(argv[1]);
 		else {
 			return error("Misformatted Input", "");
 		}