Changeset b791c33 in OpenModelica

Timestamp:

2016-04-06T05:51:28+02:00 (8 years ago)

Author:

Adeel Asghar <adeel.asghar@…>

Branches:

Added-citation-metadata, maintenance/v1.14, maintenance/v1.15, maintenance/v1.16, maintenance/v1.17, maintenance/v1.18, maintenance/v1.19, maintenance/v1.20, maintenance/v1.21, maintenance/v1.22, maintenance/v1.23, master, omlib-staging

Children:

e3d9697

Parents:

3c28781

Message:

Removed unused OMC parser.

Location:

OMEdit/OMEditGUI

Files:

• Debugger/Parser/Makefile.common (modified) (1 diff)
• Debugger/Parser/Makefile.lib.common (modified) (3 diffs)
• OMC/OMCProxy.cpp (modified) (2 diffs)
• OMC/Parser/OMCOutput.g (deleted)
• OMEditGUI.pro (modified) (2 diffs)

OMEdit/OMEditGUI/Debugger/Parser/Makefile.common

@@ -13 +13 @@
   rm -f antlr3*.o
 
-parsergen: GDBMIOutput.g ../../OMC/Parser/OMCParser.g
+parsergen: GDBMIOutput.g
   $(ANTLRCMD) GDBMIOutput.g
-  (cd ../../OMC/Parser/ && $(ANTLRCMD) OMCParser.g)
 
 OBJS = GDBMIOutputLexer.o \

OMEdit/OMEditGUI/Debugger/Parser/Makefile.lib.common

@@ -1 +1 @@
 ANTLRCMD=java -cp $(ANTLRJAR) org.antlr.Tool -Xconversiontimeout 10000 -report
-PARSERGEN=GDBMIOutputLexer.c GDBMIOutputLexer.h GDBMIOutputParser.c GDBMIOutputParser.h ../../OMC/Parser/OMCOutputLexer.cpp ../../OMC/Parser/OMCOutputLexer.h ../../OMC/Parser/OMCOutputParser.cpp ../../OMC/Parser/OMCOutputParser.h
+PARSERGEN=GDBMIOutputLexer.c GDBMIOutputLexer.h GDBMIOutputParser.c GDBMIOutputParser.h
 
 all: $(PARSERGEN) libGDBMIParser.a
@@ -9 +9 @@
 GDBMIOutputLexer.c: GDBMIOutput.g
   $(ANTLRCMD) $<
-
-../../OMC/Parser/OMCOutputLexer.cpp: ../../OMC/Parser/OMCOutputLexer.c
-  cp $< $@
-../../OMC/Parser/OMCOutputParser.cpp: ../../OMC/Parser/OMCOutputParser.c
-  cp $< $@
-
-../../OMC/Parser/OMCOutputLexer.c: ../../OMC/Parser/OMCOutputLexer.h
-../../OMC/Parser/OMCOutputLexer.h: ../../OMC/Parser/OMCOutputParser.h
-../../OMC/Parser/OMCOutputParser.h: ../../OMC/Parser/OMCOutputParser.c
-../../OMC/Parser/OMCOutputParser.c: ../../OMC/Parser/OMCOutput.g
-  (cd ../../OMC/Parser/ && $(ANTLRCMD) OMCOutput.g)
 
 OBJS = GDBMIOutputLexer.o \
@@ -45 +34 @@
   GDBMIOutput.tokens \
   GDBMIOutputLexer.c GDBMIOutputLexer.h \
-  GDBMIOutputParser.c GDBMIOutputParser.h \
-  ../../OMC/Parser/OMCOutput.tokens \
-  ../../OMC/Parser/OMCOutput*.c* ../../OMC/Parser/OMCOutput*.h ../../OMC/Parser/*.o
+  GDBMIOutputParser.c GDBMIOutputParser.h

OMEdit/OMEditGUI/OMC/OMCProxy.cpp

@@ -36 +36 @@
  */
 
-#include <OMC/Parser/OMCOutputLexer.h>
-#include <OMC/Parser/OMCOutputParser.h>
 #include "meta/meta_modelica.h"
 #ifdef WIN32
@@ -62 +60 @@
 #include "simulation_options.h"
 #include "omc_error.h"
-
-static QVariant parseExpression(QString result)
-{
-  QVariant res;
-  pANTLR3_INPUT_STREAM input;
-  pOMCOutputLexer lex;
-  pANTLR3_COMMON_TOKEN_STREAM tokens;
-  pOMCOutputParser parser;
-  QByteArray ba = result.toUtf8();
-
-  input  = antlr3NewAsciiStringInPlaceStream((pANTLR3_UINT8)ba.data(), ba.size(), (pANTLR3_UINT8)"");
-  lex    = OMCOutputLexerNew(input);
-  tokens = antlr3CommonTokenStreamSourceNew(ANTLR3_SIZE_HINT, TOKENSOURCE(lex));
-  parser = OMCOutputParserNew(tokens);
-
-  parser->exp(parser, res);
-  // Clean up? Check error? For chickens
-  parser->free(parser);
-  tokens->free(tokens);
-  lex->free(lex);
-  input->close(input);
-  return res;
-}
 
 /*!

OMEdit/OMEditGUI/OMEditGUI.pro

@@ -156 +156 @@
   Debugger/Attach/ProcessListModel.cpp \
   CrashReport/backtrace.c \
-  CrashReport/CrashReportDialog.cpp \
-  OMC/Parser/OMCOutputParser.cpp \
-  OMC/Parser/OMCOutputLexer.cpp
+  CrashReport/CrashReportDialog.cpp
 
 HEADERS  += Util/Helper.h \
@@ -223 +221 @@
   Debugger/Attach/ProcessListModel.h \
   CrashReport/backtrace.h \
-  CrashReport/CrashReportDialog.h \
-  OMC/Parser/OMCOutputParser.h \
-  OMC/Parser/OMCOutputLexer.h
+  CrashReport/CrashReportDialog.h
 
 LIBS += -lqjson