- copied options.cpp, options.h from OpenModelica/mosh

  to here to get rid of the dependency
- small update to read_write.c

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@3661 f25d12d1-65f4-0310-ae8a-bbce733d8d8e

Author: adrpo

c_runtime/Makefile

@@ -9,7 +9,7 @@ AR = ar -ru
 UNAME := $(shell uname -m)
 CMDFPUFLAGS := `case ${UNAME} in i[3456]86) echo "-msse2 -mfpmath=sse";; x86_64) echo "-msse2 -mfpmath=sse";; *) echo "";; esac`
 FPUFLAGS := ${CMDFPUFLAGS}
-CFLAGS = -Wall -O3 ${FPUFLAGS} -fexceptions -ansi -pedantic -I$(top_builddir)/mosh/src/ $(EXTRA_CFLAGS)
+CFLAGS = -Wall -O3 ${FPUFLAGS} -fexceptions -ansi -pedantic -I. $(EXTRA_CFLAGS)
 CPPFLAGS = $(CFLAGS)
 FFLAGS  = -O -fexceptions
 # P.A: before, g77 had -O3 or -O2 but that caused a bug in DDASRT, giving infinite loop.
@@ -25,7 +25,7 @@ biglag.o  ddassl.o  dogleg.o  fdjac1.o  hybrj.o   newuoa.o   qrfac.o   trsapp.o
 daux.o    dlamch.o  dpmpar.o  hybrd.o   lsame.o   newuob.o   r1mpyq.o  update.o $(EXTRA_OBJS)
 
 SIMOBJS = $(FOBJS) simulation_runtime.o simulation_init.o simulation_input.o simulation_events.o \
-solver_dasrt.o solver_euler.o simulation_result.o tables.o ../mosh/src/options.o dgesv_aux.o meta_modelica.o $(EXTRA_SIMOBJS)
+solver_dasrt.o solver_euler.o simulation_result.o tables.o options.o dgesv_aux.o meta_modelica.o $(EXTRA_SIMOBJS)
 
 HFILES = blaswrap.h f2c.h integer_array.h memory_pool.h modelica_string.h \
 	base_array.h inline.h real_array.h string_array.h boolean_array.h \

c_runtime/options.cpp

@@ -0,0 +1,69 @@
+/* 
+ * This file is part of OpenModelica.
+ * 
+ * Copyright (c) 1998-2008, Linköpings University,
+ * Department of Computer and Information Science, 
+ * SE-58183 Linköping, Sweden. 
+ * 
+ * All rights reserved.
+ * 
+ * THIS PROGRAM IS PROVIDED UNDER THE TERMS OF THIS OSMC PUBLIC 
+ * LICENSE (OSMC-PL). ANY USE, REPRODUCTION OR DISTRIBUTION OF 
+ * THIS PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THE OSMC 
+ * PUBLIC LICENSE. 
+ * 
+ * The OpenModelica software and the Open Source Modelica 
+ * Consortium (OSMC) Public License (OSMC-PL) are obtained 
+ * from Linköpings University, either from the above address, 
+ * from the URL: http://www.ida.liu.se/projects/OpenModelica
+ * and in the OpenModelica distribution.
+ * 
+ * This program is distributed  WITHOUT ANY WARRANTY; without 
+ * even the implied warranty of  MERCHANTABILITY or FITNESS 
+ * FOR A PARTICULAR PURPOSE, EXCEPT AS EXPRESSLY SET FORTH 
+ * IN THE BY RECIPIENT SELECTED SUBSIDIARY LICENSE CONDITIONS 
+ * OF OSMC-PL. 
+ * 
+ * See the full OSMC Public License conditions for more details.
+ * 
+ */
+
+#include "options.h"
+
+#include <string>
+
+using namespace std;
+
+bool flagSet(char *option, int argc, char** argv)
+{
+  for (int i=0; i<argc;i++) {
+    if (("-"+string(option))==string(argv[i])) return true;
+  }
+  return false;
+}
+/* returns the value of a flag on the form -flagname=value
+ */
+const string* getOption(const char *option, int argc, char **argv)
+{
+  for (int i=0; i<argc;i++) {
+    string tmpStr=string(argv[i]);
+    if (("-"+string(option))==(tmpStr.substr(0,tmpStr.find("=")))) {
+      string str=string(argv[i]);
+      return new string(str.substr(str.find("=")+1));
+    }
+  }
+  return NULL;
+}
+/* returns the value of a flag on the form -flagname value */
+const string* getFlagValue(const char *option, int argc, char **argv)
+{
+  for (int i=0; i<argc;i++) {
+    string tmpStr=string(argv[i]);
+    if (("-"+string(option))==string(argv[i])) {
+      if (argc >= i+1) {
+	return new string(argv[i+1]);
+      }
+    }
+  } 
+  return NULL;
+}

c_runtime/options.h

@@ -0,0 +1,46 @@
+/* 
+ * This file is part of OpenModelica.
+ * 
+ * Copyright (c) 1998-2008, Linköpings University,
+ * Department of Computer and Information Science, 
+ * SE-58183 Linköping, Sweden. 
+ * 
+ * All rights reserved.
+ * 
+ * THIS PROGRAM IS PROVIDED UNDER THE TERMS OF THIS OSMC PUBLIC 
+ * LICENSE (OSMC-PL). ANY USE, REPRODUCTION OR DISTRIBUTION OF 
+ * THIS PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THE OSMC 
+ * PUBLIC LICENSE. 
+ * 
+ * The OpenModelica software and the Open Source Modelica 
+ * Consortium (OSMC) Public License (OSMC-PL) are obtained 
+ * from Linköpings University, either from the above address, 
+ * from the URL: http://www.ida.liu.se/projects/OpenModelica
+ * and in the OpenModelica distribution.
+ * 
+ * This program is distributed  WITHOUT ANY WARRANTY; without 
+ * even the implied warranty of  MERCHANTABILITY or FITNESS 
+ * FOR A PARTICULAR PURPOSE, EXCEPT AS EXPRESSLY SET FORTH 
+ * IN THE BY RECIPIENT SELECTED SUBSIDIARY LICENSE CONDITIONS 
+ * OF OSMC-PL. 
+ * 
+ * See the full OSMC Public License conditions for more details.
+ * 
+ */
+
+#ifndef _MYOPTIONS
+#define _MYOPTIONS
+
+#include <string>
+#include <algorithm>
+
+/* -f */
+bool flagSet(char*, int, char**);
+
+/* -f=value */
+const std::string * getOption(const char*, int, char **);
+
+/* -f value */
+const std::string* getFlagValue(const char *, int , char **);
+
+#endif

c_runtime/read_write.c

@@ -107,10 +107,10 @@ void free_type_description(type_description *desc)
   case TYPE_DESC_RECORD: {
     size_t i;
     type_description *e = desc->data.record.element;
-    char **n = desc->data.record.name;
-    for (i = 0; i < desc->data.record.elements; ++i, ++e, ++n) {
-      free(*n);
-      free_type_description(e);
+    /* char **n = desc->data.record.name; */
+    for (i = 0; i < desc->data.record.elements; i++, e++) {
+      free(desc->data.record.name[i]);
+	  free_type_description(e);
     }
     if (desc->data.record.elements > 0) {
       free(desc->data.record.element);
@@ -516,7 +516,11 @@ type_description *add_modelica_record_member(type_description *desc,
                                       * (desc->data.record.elements + 1));
   elem = desc->data.record.element + desc->data.record.elements;
   desc->data.record.name[desc->data.record.elements] = malloc(nlen + 1);
-  memcpy(desc->data.record.name[desc->data.record.elements], name, nlen + 1);
+  memcpy(desc->data.record.name[desc->data.record.elements], name, nlen + 1); 
+  /*
+   * strdup is not ansi! 
+   * desc->data.record.name[desc->data.record.elements] = strdup(name);
+   */
   ++desc->data.record.elements;
   init_type_description(elem);
   return elem;