Skip to content

Commit d948c0f

Browse files
Manuel AstudilloManuel Astudillo
Manuel Astudillo
authored and
Manuel Astudillo
committed
Merge branch 'RELEASE_1_0_4'
Conflicts: Makefile.gcc WHATSNEW examples/XML/Makefile.gcc examples/XML/gcc-linux.mak examples/logic/AxiomList.h examples/logic/Implication.h examples/logic/LogicASTCreator.cpp examples/logic/Makefile.acc examples/logic/Makefile.gcc examples/logic/logic.cpp examples/logic/logic.dsw examples/logic/logic.ncb examples/simple/simple.cpp include/ASTNode.h include/SymbolTable.h src/ASTCreator.cpp src/DFA.cpp
2 parents b070046 + 315f3cb commit d948c0f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+84
-53
lines changed

‎Makefile.gcc

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
11
# Project: cpp-gpengine
22
# Makefile created by Pablo Garcia Ganzalez
3+
<<<<<<< HEAD
34
# Date: 05.04.2004
45
# CVS-ID: $Id: Makefile.gcc,v 1.2 2004/04/05 21:00:00 xtremox Exp $
6+
=======
7+
# Date: 19.10.2003
8+
# CVS-ID: $Id: Makefile.gcc,v 1.1.2.1 2003/11/30 12:55:29 d00mas Exp $
9+
>>>>>>> RELEASE_1_0_4
510

611
CPP = g++
712
OBJ = src/ASTCreator.o src/ASTNode.o src/CGTFile.o src/CharacterSetTable.o src/DFA.o src/DFAStateTable.o src/ErrorReporter.o src/ErrorTable.o src/GrammarInfo.o src/LALR.o src/LALRStateTable.o src/NonTerminal.o src/RuleTable.o src/Symbol.o src/SymbolTable.o src/Terminal.o src/Token.o

‎WHATSNEW

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,17 @@
11
History
22
-------
33

4+
<<<<<<< HEAD
45
version 1.2 2004/01/15
56
------------------------
67
- Burke-Fisher global error repair implemented
78
- Remove remaining wchar_t*
89
- Updated documentation
910

1011
version 1.0.6 2003/11/29 (was never public released)
12+
=======
13+
version 1.0.6 2003/11/29
14+
>>>>>>> RELEASE_1_0_4
1115
------------------------
1216
+ Added 3 examples to show how to use the engine.
1317
+ Exchange a lot of wchar_t* strings to the more reliable wstring

‎examples/logic/AxiomList.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,6 @@
33

44
class AxiomList : public Any {
55

6+
67
};
78

‎examples/logic/Implication.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,4 @@ class Implication : public Any {
55

66
};
77

8+

‎examples/logic/LogicASTCreator.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
// Please read AbstractSyntaxGrammr.txt for info on the abstract grammar
88

9+
910
ASTNode *LogicASTCreator::getASTNode (const Symbol *reduction,
1011
ASTNode *parent) {
1112
vector <ASTNode*> *children = NULL;

‎examples/logic/Makefile.acc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,9 @@
44

55
CPP = aCC
66
OBJ = simple.o
7+
78
GPENGINELIB = ../../lib/cpp-gpengine-1.2.0.sl
9+
810
LIBS = -L"../../lib"
911
CXXINCS = -I"../../include/" -I"/usr/include"
1012
BIN = simple

‎examples/logic/logic.cpp

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,11 @@
55
-------------------
66
begin : Fri May 31 00:53:11 CEST 2002
77
copyright : (C) 2002-2003 by Manuel Astudillo
8-
email : d00mas@efd.lth.se
8+
99
***************************************************************************/
10+
1011

12+
1113
/***************************************************************************
1214
* *
1315
* This program is free software; you can redistribute it and/or modify *
@@ -16,7 +18,7 @@
1618
* License, or (at your option) any later version. *
1719
* *
1820
***************************************************************************/
19-
21+
2022
#include <iostream>
2123
#include <stdlib.h>
2224

@@ -39,7 +41,7 @@ int main(int argc, char *argv[])
3941
ErrorTable *myErrors;
4042
ErrorReporter myReporter;
4143
LogicASTCreator myASTCreator;
42-
44+
4345
// Load grammar file
4446
if (cgtFile.load ("logic.cgt")) {
4547
wprintf (L"%s\n", "Grammar loaded succesfully");
@@ -70,7 +72,9 @@ int main(int argc, char *argv[])
7072

7173
// If there are errors report them
7274
if (myErrors->errors.size() > 0) {
73-
for (unsigned int i=0; i < myErrors->errors.size(); i++) {
75+
76+
for (unsigned int i=0; i < myErrors->errors.size(); i++) {
77+
7478
cout << filename << ":";
7579
cout << myReporter.composeErrorMsg (*myErrors->errors[i]) << endl;
7680
}
@@ -89,7 +93,9 @@ int main(int argc, char *argv[])
8993

9094
myErrors = lalr->getErrors();
9195
if (myErrors->errors.size() != 0) {
92-
for (unsigned int i=0; i < myErrors->errors.size(); i++) {
96+
97+
for (unsigned int i=0; i < myErrors->errors.size(); i++) {
98+
9399
cout << filename << ":";
94100
cout << myReporter.composeErrorMsg (*myErrors->errors[i]) << endl;
95101
}

‎examples/logic/logic.dsw

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ Microsoft Developer Studio Workspace File, Format Version 6.00
33

44
###############################################################################
55

6+
67
Project: "gpengine"="..\..\projfiles\VC6\gpengine.dsp" - Package Owner=<4>
78

89
Package=<5>

‎examples/simple/simple.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
-------------------
44
begin : Fri May 31 00:53:11 CEST 2002
55
copyright : (C) 2002-2003 by Manuel Astudillo
6-
email : d00mas@efd.lth.se
6+
77
***************************************************************************/
88

99
/***************************************************************************
@@ -14,7 +14,7 @@
1414
* License, or (at your option) any later version. *
1515
* *
1616
***************************************************************************/
17-
17+
1818
#include <iostream>
1919
#include <stdlib.h>
2020

‎include/ASTCreator.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
-------------------
77
begin : Sun Jun 2 2002
88
copyright : (C) 2002 by Manuel Astudillo
9-
email : d00mas@efd.lth.se
9+
1010
***************************************************************************/
1111
/***************************************************************************
1212
* *

‎include/ASTNode.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
-------------------
55
begin : Tue Jun 25 09:50:11 CEST 2002
66
copyright : (C) 2002 by Manuel Astudillo
7-
email : d00mas@efd.lth.se
7+
88
***************************************************************************/
99

1010
/***************************************************************************
@@ -50,13 +50,15 @@
5050
virtual ~ASTNode ();
5151

5252
void init (const Symbol *s, ASTNode *parent);
53+
5354
void setImage (wstring image);
5455
void setSymbol (wstring symbol);
5556

5657
std::wstring getImage ();
5758
std::wstring getSymbol ();
5859

5960
void setParent (ASTNode *parent);
61+
6062
ASTNode *getParent ();
6163

6264
void addChild (ASTNode *child);

‎include/CGTFile.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
-------------------
66
begin : Sat Jun 1 2002
77
copyright : (C) 2002 by Manuel Astudillo
8-
email : d00mas@efd.lth.se
8+
99
***************************************************************************/
1010

1111
/***************************************************************************

‎include/CharacterSetTable.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
-------------------
44
begin : Sun Jun 2 2002
55
copyright : (C) 2002 by Manuel Astudillo
6-
email : d00mas@efd.lth.se
6+
77
***************************************************************************/
88

99
/***************************************************************************

‎include/DFA.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
-------------------
44
begin : Sun Jun 2 2002
55
copyright : (C) 2002 by Manuel Astudillo
6-
email : d00mas@efd.lth.se
6+
77
***************************************************************************/
88

99
/***************************************************************************

‎include/DFAStateTable.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
-------------------
44
begin : Sun Jun 2 2002
55
copyright : (C) 2002 by Manuel Astudillo
6-
email : d00mas@efd.lth.se
6+
77
***************************************************************************/
88

99
/***************************************************************************

‎include/ErrorReporter.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
--------------------------------------
66
begin : Sat Sep 20 2003
77
copyright : (C) 2002-2003 Manuel Astudillo
8-
email : d00mas@efd.lth.se
8+
99
***************************************************************************/
1010

1111
/***************************************************************************

‎include/ErrorTable.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
------------------------------
44
begin : Mon Jun 17 2002
55
copyright : (C) 2002 by Manuel Astudillo
6-
email : d00mas@efd.lth.se
6+
77
***************************************************************************/
88

99
/***************************************************************************

‎include/GrammarInfo.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
-------------------
44
begin : Sat Jun 1 2002
55
copyright : (C) 2002 by Manuel Astudillo
6-
email : d00mas@efd.lth.se
6+
77
***************************************************************************/
88

99
/***************************************************************************

‎include/LALR.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
------------------------
44
begin : Thu Jun 13 2002
55
copyright : (C) 2002 by Manuel Astudillo
6-
email : d00mas@efd.lth.se
6+
77
***************************************************************************/
88

99
/***************************************************************************

‎include/LALRStateTable.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
-------------------
44
begin : Fri Jun 14 2002
55
copyright : (C) 2002 by Manuel Astudillo
6-
email : d00mas@efd.lth.se
6+
77
***************************************************************************/
88

99
/***************************************************************************

‎include/NonTerminal.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
-------------------
66
begin : Fri Oct 24 2003
77
copyright : (C) 2002-2003 Manuel Astudillo
8-
email : d00mas@efd.lth.se
8+
99
***************************************************************************/
1010
/***************************************************************************
1111
* *

‎include/RuleTable.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
-------------------
44
begin : Fri Jun 14 2002
55
copyright : (C) 2002 by Manuel Astudillo
6-
email : d00mas@efd.lth.se
6+
77
***************************************************************************/
88

99
/***************************************************************************

‎include/Symbol.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
-------------------
66
begin : Fri Oct 24 2003
77
copyright : (C) 2002-2003 Manuel Astudillo
8-
email : d00mas@efd.lth.se
8+
99
***************************************************************************/
1010
/***************************************************************************
1111
* *

‎include/SymbolTable.h

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
-------------------
44
begin : Sun Jun 2 2002
55
copyright : (C) 2002 by Manuel Astudillo
6-
email : d00mas@efd.lth.se
6+
77
***************************************************************************/
88

99
/***************************************************************************
@@ -20,7 +20,18 @@
2020
#include "misc.h"
2121
#include <string>
2222

23-
enum SymbolType {TERMINAL = 1, NON_TERMINAL = 0};
23+
24+
enum SymbolType
25+
{
26+
TERMINAL = 1,
27+
NON_TERMINAL = 0,
28+
WHITESPACE = 2,
29+
END_SYMBOL = 3,
30+
START_COMMENT = 4,
31+
END_COMMENT = 5,
32+
LINE_COMMENT = 6
33+
};
34+
2435

2536
typedef struct SymbolStruct {
2637
std::wstring name;

‎include/Terminal.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
-------------------
66
begin : Fri Oct 24 2003
77
copyright : (C) 2002-2003 Manuel Astudillo
8-
email : d00mas@efd.lth.se
8+
99
***************************************************************************/
1010
/***************************************************************************
1111
* *

‎include/Token.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
-------------------
44
begin : Sun Jun 2 2002
55
copyright : (C) 2002 by Manuel Astudillo
6-
email : d00mas@efd.lth.se
6+
77
***************************************************************************/
88
/***************************************************************************
99
* *

‎include/misc.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
-------------------
44
begin : Sun Jun 2 2002
55
copyright : (C) 2002 by Manuel Astudillo
6-
email : d00mas@efd.lth.se
6+
77
***************************************************************************/
88

99
/***************************************************************************

‎src/ASTCreator.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
-------------------
77
begin : Sun Jun 2 2002
88
copyright : (C) 2002 by Manuel Astudillo
9-
email : d00mas@efd.lth.se
9+
1010
***************************************************************************/
1111
/***************************************************************************
1212
* *
@@ -98,10 +98,10 @@
9898
return stmtList;
9999
}
100100
*/
101-
102101
/*
103102
If the symbol constants are included it is possible to do it in the possible way:
104103
104+
105105
// <If Statement> ::= if <Expression> then <StatementList> end
106106
if (sym == RULE_IF_THEN_END_STATEMENT) {
107107
IfStatement *ifStatement = new IfStatement ();

‎src/ASTNode.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
-------------------
55
begin : Tue Jun 25 09:52:11 CEST 2002
66
copyright : (C) 2002 by Manuel Astudillo
7-
email : d00mas@efd.lth.se
7+
88
***************************************************************************/
99

1010
/***************************************************************************

‎src/CGTFile.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
-------------------
66
begin : Fri May 31 00:53:11 CEST 2002
77
copyright : (C) 2002 by Manuel Astudillo
8-
email : d00mas@efd.lth.se
8+
99
***************************************************************************/
1010

1111
/***************************************************************************

‎src/CharacterSetTable.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
-------------------
44
begin : Sun Jun 2 2002
55
copyright : (C) 2002 by Manuel Astudillo
6-
email : d00mas@efd.lth.se
6+
77
***************************************************************************/
88

99
/***************************************************************************

0 commit comments

Comments
 (0)