Changeset 32578 for grass/trunk/raster/r.mapcalc

Timestamp:

Aug 6, 2008, 10:48:43 AM (16 years ago)

Author:

glynn

Message:

Make r.mapcalc use G_parser()

Location:

grass/trunk/raster/r.mapcalc

Files:

• evaluate.c (modified) (1 diff)
• globals.h (modified) (1 diff)
• main.c (modified) (3 diffs)
• map.c (modified) (1 diff)
• map3.c (modified) (1 diff)
• mapcalc.h (modified) (1 diff)

grass/trunk/raster/r.mapcalc/evaluate.c

@@ -270 +270 @@
         expression *e = l->exp;
         const char *var;
+
+        if (e->type != expr_type_binding)
+            G_fatal_error("internal error: execute: invalid type: %d",
+                          e->type);
+
+        var = e->data.bind.var;
+
+        if (!overwrite && check_output_map(var))
+            G_fatal_error(_("output map <%s> exists"), var);
+    }
+
+    for (l = ee; l; l = l->next) {
+        expression *e = l->exp;
+        const char *var;
         expression *val;
 

grass/trunk/raster/r.mapcalc/globals.h

@@ -6 +6 @@
 extern volatile int floating_point_exception_occurred;
 extern int overflow_occurred;
+extern int overwrite;
 
 extern int current_depth, current_row;

grass/trunk/raster/r.mapcalc/main.c

@@ -27 +27 @@
 
 int overflow_occurred;
+int overwrite;
 
 volatile int floating_point_exception;
 volatile int floating_point_exception_occurred;
-
-/****************************************************************************/
-
-static const char help_text[] =
-    "r.mapcalc - Raster map layer data calculator\n"
-    "\n"
-    "usage: r.mapcalc '<map>=<expression>'\n"
-    "\n"
-    "r.mapcalc performs arithmetic on raster map layers.\n"
-    "\n"
-    "New raster map layers can be created which are arithmetic expressions\n"
-    "involving existing raster map layers, integer or floating point constants,\n"
-    "and functions.\n" "\n" "For more information use 'g.manual r.mapcalc'\n";
 
 /****************************************************************************/
@@ -91 +79 @@
 /****************************************************************************/
 
-static const char *join(int argc, char **argv)
+static expr_list *parse_file(const char *filename)
 {
-    int size = 0;
-    char *buf;
-    int i;
+    expr_list *res;
+    FILE *fp;
 
-    for (i = 0; i < argc; i++)
-        size += strlen(argv[i]) + 1;
+    if (strcmp(filename, "-") == 0)
+        return parse_stream(stdin);
 
-    buf = G_malloc(size);
-    *buf = '\0';
-    for (i = 0; i < argc; i++) {
-        if (i)
-            strcat(buf, " ");
-        strcat(buf, argv[i]);
-    }
+    fp = fopen(filename, "r");
+    if (!fp)
+        G_fatal_error(_("unable to open input file <%s>"), filename);
 
-    return buf;
+    res = parse_stream(fp);
+
+    fclose(fp);
+
+    return res;
 }
 
@@ -115 +102 @@
 int main(int argc, char **argv)
 {
+    struct GModule *module;
+    struct Option *expr, *file;
     int all_ok;
-    int overwrite;
 
     G_gisinit(argv[0]);
 
-    if (argc > 1 && (strcmp(argv[1], "help") == 0 ||
-                     strcmp(argv[1], "--help") == 0)) {
-        fputs(help_text, stderr);
-        return EXIT_SUCCESS;
+    module = G_define_module();
+    module->keywords = _("raster");
+    module->description = _("Raster map calculator.");
+    module->overwrite = 1;
+
+    expr = G_define_option();
+    expr->key = "expression";
+    expr->type = TYPE_STRING;
+    expr->required = NO;
+    expr->description = _("Expression to evaluate");
+
+    file = G_define_standard_option(G_OPT_F_INPUT);
+    file->required = NO;
+    file->description = _("File containing expression to evaluate");
+
+    if (argc == 1)
+    {
+        char **p = G_malloc(3 * sizeof(char *));
+        p[0] = argv[0];
+        p[1] = G_store("input=-");
+        p[2] = NULL;
+        argv = p;
+        argc = 2;
     }
 
-    result = (argc >= 2)
-        ? parse_string(join(argc - 1, argv + 1))
-        : parse_stream(stdin);
+    if (G_parser(argc, argv))
+        exit(EXIT_FAILURE);
+
+    overwrite = module->overwrite;
+
+    if (expr->answer)
+        result = parse_string(expr->answer);
+    else if (file->answer)
+        result = parse_file(file->answer);
+    else
+        result = parse_stream(stdin);
 
     if (!result)
-        return EXIT_FAILURE;
-
-    overwrite = G_check_overwrite(argc, argv);
-
+        G_fatal_error(_("parse error"));
 
     pre_exec();

grass/trunk/raster/r.mapcalc/map.c

@@ -499 +499 @@
 /****************************************************************************/
 
+int check_output_map(const char *name)
+{
+    return !!G_find_cell2(name, G_mapset());
+}
+
 int open_output_map(const char *name, int res_type)
 {

grass/trunk/raster/r.mapcalc/map3.c

@@ -567 +567 @@
 /****************************************************************************/
 
+int check_output_map(const char *name)
+{
+    return !!G_find_grid3(name, G_mapset());
+}
+
 int open_output_map(const char *name, int res_type)
 {

grass/trunk/raster/r.mapcalc/mapcalc.h

@@ -50 +50 @@
 extern void close_maps(void);
 
+extern int check_output_map(const char *name);
 extern int open_output_map(const char *name, int res_type);
 extern void put_map_row(int fd, void *buf, int res_type);