# HG changeset patch
# User John Tsiombikas <nuclear@member.fsf.org>
# Date 1450557558 -7200
# Node ID 099fd7adb900d96ebd33aedc1e4c26152b7447d8
# Parent  95fada20c6384f9aa388b69468e6c546671a7886
curve parser works

diff -r 95fada20c638 -r 099fd7adb900 src/curvefile.cc
--- a/src/curvefile.cc	Sat Dec 19 17:40:27 2015 +0200
+++ b/src/curvefile.cc	Sat Dec 19 22:39:18 2015 +0200
@@ -17,7 +17,7 @@
 
 bool save_curves(FILE *fp, const Curve * const *curves, int count)
 {
-	fprintf(stderr, "GCURVES\n");
+	fprintf(fp, "GCURVES\n");
 
 	for(int i=0; i<count; i++) {
 		if(!save_curve(fp, curves[i])) {
@@ -68,11 +68,23 @@
 {
 	std::string s;
 	int c;
-	while((c = fgetc(fp)) != -1 && isspace(c));	// skip whitespace
+	while((c = fgetc(fp)) != -1) {
+		if(!isspace(c)) {
+			ungetc(c, fp);
+			break;
+		}
+	}
+
 	if(feof(fp)) return s;
-	while((c = fgetc(fp)) != -1 && !isspace(c)) {
+	while((c = fgetc(fp)) != -1) {
+		if(isspace(c)) {
+			ungetc(c, fp);
+			break;
+		}
 		s.push_back(c);
 	}
+
+	printf("TOKEN: \"%s\"\n", s.c_str());
 	return s;
 }
 
@@ -80,7 +92,7 @@
 {
 	std::string tok = next_token(fp);
 	if(tok != std::string(s)) {
-		if(!(tok.empty() && feof(fp))) {
+		if(tok.empty() && feof(fp)) {
 			fprintf(stderr, "expected: %s\n", s);
 		}
 		return false;
@@ -144,7 +156,7 @@
 				goto err;
 			}
 		} else {
-			if(!expect_str(fp, "cp")) {
+			if(tok != "cp") {
 				goto err;
 			}
 			Vector3 cp;