Merge branch 'new-debian' into debian

Conflicts:
	ChangeLog
	debian/altos.install
	debian/changelog
	debian/control
	debian/copyright
	debian/dirs
	debian/docs
	debian/menu
	debian/rules
	src/Makefile

1 files changed, 78 insertions, 0 deletions

diff --git a/altoslib/AltosParse.java b/altoslib/AltosParse.java
new file mode 100644
index 00000000..e938a177
--- /dev/null
+++ b/altoslib/AltosParse.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright © 2010 Keith Packard <keithp@keithp.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+ */
+
+package org.altusmetrum.AltosLib;
+
+import java.text.*;
+
+public class AltosParse {
+	public static boolean isdigit(char c) {
+		return '0' <= c && c <= '9';
+	}
+
+	public static int parse_int(String v) throws ParseException {
+		try {
+			return AltosLib.fromdec(v);
+		} catch (NumberFormatException e) {
+			throw new ParseException("error parsing int " + v, 0);
+		}
+	}
+
+	public static int parse_hex(String v) throws ParseException {
+		try {
+			return AltosLib.fromhex(v);
+		} catch (NumberFormatException e) {
+			throw new ParseException("error parsing hex " + v, 0);
+		}
+	}
+
+	public static double parse_double(String v) throws ParseException {
+		try {
+			return Double.parseDouble(v);
+		} catch (NumberFormatException e) {
+			throw new ParseException("error parsing double " + v, 0);
+		}
+	}
+
+	public static double parse_coord(String coord) throws ParseException {
+		String[]	dsf = coord.split("\\D+");
+
+		if (dsf.length != 3) {
+			throw new ParseException("error parsing coord " + coord, 0);
+		}
+		int deg = parse_int(dsf[0]);
+		int min = parse_int(dsf[1]);
+		int frac = parse_int(dsf[2]);
+
+		double r = deg + (min + frac / 10000.0) / 60.0;
+		if (coord.endsWith("S") || coord.endsWith("W"))
+			r = -r;
+		return r;
+	}
+
+	public static String strip_suffix(String v, String suffix) {
+		if (v.endsWith(suffix))
+			return v.substring(0, v.length() - suffix.length());
+		return v;
+	}
+
+	public static void word(String v, String m) throws ParseException {
+		if (!v.equals(m)) {
+			throw new ParseException("error matching '" + v + "' '" + m + "'", 0);
+		}
+	}
+}