Integrated project Hazard into project GDE

GDE_3_2008/GDE_3.vcxproj

@@ -111,16 +111,16 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="Cparser.cpp" />
+    <ClCompile Include="..\Hazard\Hazard\Cell.cpp" />
+    <ClCompile Include="..\Hazard\Hazard\CParser.cpp" />
+    <ClCompile Include="..\Hazard\Hazard\Hazard.cpp" />
+    <ClCompile Include="..\Hazard\Hazard\PrimImplikant.cpp" />
+    <ClCompile Include="..\Hazard\Hazard\PrimImplikantCollection.cpp" />
+    <ClCompile Include="..\Hazard\Hazard\Wertetabelle.cpp" />
     <ClCompile Include="GDE_3.cpp" />
     <ClCompile Include="GDE_3Doc.cpp" />
     <ClCompile Include="GDE_3View.cpp" />
     <ClCompile Include="MainFrm.cpp" />
-    <ClCompile Include="PrimImplikant.cpp" />
-    <ClCompile Include="stdafx.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
-    </ClCompile>
     <ClCompile Include="user.cpp" />
     <ClCompile Include="Graphics\Dib.cpp" />
     <ClCompile Include="Graphics\Graphicfunctions.cpp" />
@@ -128,16 +128,17 @@
     <ClCompile Include="Console\Console.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="Cparser.h" />
+    <ClInclude Include="..\Hazard\Hazard\Cell.h" />
+    <ClInclude Include="..\Hazard\Hazard\CParser.h" />
+    <ClInclude Include="..\Hazard\Hazard\PrimImplikant.h" />
+    <ClInclude Include="..\Hazard\Hazard\PrimImplikantCollection.h" />
+    <ClInclude Include="..\Hazard\Hazard\Wertetabelle.h" />
     <ClInclude Include="GDE_3.h" />
     <ClInclude Include="GDE_3Doc.h" />
     <ClInclude Include="GDE_3View.h" />
     <ClInclude Include="MainFrm.h" />
-    <ClInclude Include="PrimImplikantCollection.h" />
-    <ClInclude Include="PrimImplikanten.h" />
     <ClInclude Include="Resource.h" />
     <ClInclude Include="stdafx.h" />
-    <ClInclude Include="User.h" />
     <ClInclude Include="Graphics\BaseException.h" />
     <ClInclude Include="Graphics\Dib.h" />
     <ClInclude Include="Graphics\Graphicfunctions.h" />
@@ -145,6 +146,7 @@
     <ClInclude Include="Graphics\PointerArray.h" />
     <ClInclude Include="Graphics\Shape.h" />
     <ClInclude Include="Console\Console.h" />
+    <ClInclude Include="User.h" />
   </ItemGroup>
   <ItemGroup>
     <None Include="res\GDE_3.ico" />

GDE_3_2008/GDE_3.vcxproj.filters

@@ -33,9 +33,6 @@
     <ClCompile Include="MainFrm.cpp">
       <Filter>Quelldateien</Filter>
     </ClCompile>
-    <ClCompile Include="stdafx.cpp">
-      <Filter>Quelldateien</Filter>
-    </ClCompile>
     <ClCompile Include="user.cpp">
       <Filter>Quelldateien</Filter>
     </ClCompile>
@@ -51,10 +48,22 @@
     <ClCompile Include="Console\Console.cpp">
       <Filter>Console</Filter>
     </ClCompile>
-    <ClCompile Include="PrimImplikant.cpp">
+    <ClCompile Include="..\Hazard\Hazard\Hazard.cpp">
       <Filter>Quelldateien</Filter>
     </ClCompile>
-    <ClCompile Include="Cparser.cpp">
+    <ClCompile Include="..\Hazard\Hazard\Cell.cpp">
+      <Filter>Quelldateien</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Hazard\Hazard\PrimImplikant.cpp">
+      <Filter>Quelldateien</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Hazard\Hazard\PrimImplikantCollection.cpp">
+      <Filter>Quelldateien</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Hazard\Hazard\Wertetabelle.cpp">
+      <Filter>Quelldateien</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Hazard\Hazard\CParser.cpp">
       <Filter>Quelldateien</Filter>
     </ClCompile>
   </ItemGroup>
@@ -77,9 +86,6 @@
     <ClInclude Include="stdafx.h">
       <Filter>Headerdateien</Filter>
     </ClInclude>
-    <ClInclude Include="User.h">
-      <Filter>Headerdateien</Filter>
-    </ClInclude>
     <ClInclude Include="Graphics\BaseException.h">
       <Filter>Graphics</Filter>
     </ClInclude>
@@ -101,13 +107,22 @@
     <ClInclude Include="Console\Console.h">
       <Filter>Console</Filter>
     </ClInclude>
-    <ClInclude Include="PrimImplikantCollection.h">
+    <ClInclude Include="User.h">
       <Filter>Headerdateien</Filter>
     </ClInclude>
-    <ClInclude Include="PrimImplikanten.h">
+    <ClInclude Include="..\Hazard\Hazard\Cell.h">
       <Filter>Headerdateien</Filter>
     </ClInclude>
-    <ClInclude Include="Cparser.h">
+    <ClInclude Include="..\Hazard\Hazard\CParser.h">
+      <Filter>Headerdateien</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Hazard\Hazard\PrimImplikant.h">
+      <Filter>Headerdateien</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Hazard\Hazard\PrimImplikantCollection.h">
+      <Filter>Headerdateien</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Hazard\Hazard\Wertetabelle.h">
       <Filter>Headerdateien</Filter>
     </ClInclude>
   </ItemGroup>

GDE_3_2008/PrimImplikant.cpp

@@ -1,36 +0,0 @@
-#include <string>
-#include <vector>
-#include "PrimImplikanten.h"
-
-using namespace std;
-
-/*
-
-PrimImplikant::PrimImplikant(int input)
-{
-	implikant.push_back(input);
-}
-*/
-PrimImplikant::PrimImplikant(string input)
-{
-	vector<int> arr;
-
-
-
-}
-bool PrimImplikant::valueAt(int x) {
-}
-
-int PrimImplikant::parser(string input){  // Analyser
-	string text = new char [input.size()];
-	//string text2 = new char [input.size()];
-	text= input;
-	char yytext[]= "";
-	for( int i=0;i<input.size();i++){
-		if(isdigit(text[i]))
-
-
-	char c;
-	while(c!=EOF)
-	c=getc(fpi);
-

GDE_3_2008/User.h

@@ -3,5 +3,5 @@
 // Das Benutzer interface.
 /////////////////////////////////////////////////////////////////////////////
 
-void user_main();		// Funktion in der der Benutzer seinen eigenen
+void user_main2();		// Funktion in der der Benutzer seinen eigenen
 					// Code programmieren kann.

GDE_3_2008/res/errorParser.txt

@@ -0,0 +1,12 @@
+*** FATAL ERROR *** You can only define either KNF or DNF!
+In line 8211212: (null)>-1105314512
+In line   4: Defined was: DNF, but now shall be changed to KNF
+
+*** FATAL ERROR *** You can only define either KNF or DNF!
+In line   4: 7>0
+In line   4: Defined was: DNF, but now shall be changed to KNF
+
+*** FATAL ERROR *** You can only define either KNF or DNF!
+In line   4: 7>1
+In line   4: Defined was: KNF, but now shall be changed to DNF
+

GDE_3_2008/res/input.txt

@@ -0,0 +1,7 @@
+Variables: a, bar, char, d
+Terms:
+"0010">1
+7>1
+14>1
+"01xx">1
+"x000">1

GDE_3_2008/stdafx.cpp

@@ -1,7 +0,0 @@
-// stdafx.cpp : Quelltextdatei, die nur die Standard-Includes einbindet
-//  GDE_3.pch ist der vorcompilierte Header
-//  stdafx.obj enthält die vorcompilierte Typinformation
-
-#include "stdafx.h"
-
-

GDE_3_2008/stdafx.h

@@ -45,3 +45,5 @@
 #include <afxcmn.h>			// MFC-Unterstützung für allgemeine Windows-Steuerelemente
 #endif // _AFX_NO_AFXCMN_SUPPORT
 
+typedef unsigned int uint;
+typedef unsigned short ushort;

GDE_3_2008/user.cpp

@@ -118,7 +118,7 @@ void Restart()
 }
 
 
-void user_main()
+void user_main2()
 {
 	int ww,hh;
 	set_windowpos(0,0,600,400);

Hazard/Hazard/Hazard.cpp

@@ -17,31 +17,31 @@ uint dimension = 0;			// = variables.size()
 uint numElements = 0;		// = 2 ^ dimension
 bool KNF = false;
 
-int _tmain(int argc, _TCHAR* argv[])
+void user_main(void)
 {
 	FILE * input;
 	FILE * error;
 	FILE * list;
-	fopen_s(&input, "..\\res\\input.txt", "r");
+	fopen_s(&input, "res\\input.txt", "r");
 	if (input == 0)
 	{
 		cout << "Fehler Inputdatei";
 		system("pause");
-		return -1;
+		return;
 	}
-	fopen_s(&error, "..\\res\\errorParser.txt", "a");
+	fopen_s(&error, "res\\errorParser.txt", "a");
 	if (error == 0)
 	{
 		cout << "Fehler Fehlerdatei";
 		system("pause");
-		return -1;
+		return;
 	}
-	fopen_s(&list, "..\\res\\listParser.txt", "w");
+	fopen_s(&list, "res\\listParser.txt", "w");
 	if (list == 0)
 	{
 		cout << "Fehler Listdatei";
 		system("pause");
-		return -1;
+		return;
 	}
 
 	PrimImplikantCollection* globalPIC = new PrimImplikantCollection();
@@ -53,7 +53,7 @@ int _tmain(int argc, _TCHAR* argv[])
 	if (parser.yyparse(globalPIC, variables) != 0)
 	{
 		system("pause");
-		return 1;
+		return;
 	}
 	system("pause");
 	
@@ -132,5 +132,5 @@ int _tmain(int argc, _TCHAR* argv[])
 
 	globalPIC->Dispose();
 	system("pause");
-	return 0;
+	return;
 }