Pouet

7 files changed, 15 insertions, 14 deletions

diff --git a/include/interface.h b/include/interface.h
index cbae0b7..787cb2f 100644
--- a/include/interface.h
+++ b/include/interface.h
@@ -2,5 +2,6 @@
 #define __INTERFACE_H__
 
 void ifloop(void);
+int quit;
 
 #endif
diff --git a/include/scalaires.h b/include/scalaires.h
index 4596fa1..11754b2 100644
--- a/include/scalaires.h
+++ b/include/scalaires.h
@@ -16,7 +16,7 @@ typedef enum typedisplay {
 extern typedisplay display;
 
 rationnel rat_constr_zero(void);	/* renvoie 0 */
-rationnel rat_constr(int num, int denom);	/* cree une fraction */
+rationnel rat_constr(unsigned long long num, unsigned long long denom);	/* cree une fraction */
 rationnel rat_constr_from_double(double flt);	/* cree une fraction a partir d un double */
 void rat_destruct(rationnel rat);	/* destructeur */
 double rat_to_double(rationnel rat);	/* obtention du double correspondant a un rationnel */
diff --git a/lib/fonctions.c b/lib/fonctions.c
index dee16a8..44cdf91 100644
--- a/lib/fonctions.c
+++ b/lib/fonctions.c
@@ -12,6 +12,7 @@
 #include "terminal.h"
 #include "exceptions.h"
 #include "polynom.h"
+#include "interface.h"
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #else
@@ -195,6 +196,5 @@ void reinit(polynome p1, polynome p2, polynome p3)
 
 void exit_call(polynome p1, polynome p2, polynome p3)
 {
-	clearterm();
-	exception(2, _("Exiting, bye!"));
-}
\ No newline at end of file
+	quit = 1;
+}
diff --git a/lib/interface.c b/lib/interface.c
index f459215..f698318 100644
--- a/lib/interface.c
+++ b/lib/interface.c
@@ -7,6 +7,8 @@
 #include "parser.h"
 #include "pile.h"
 
+int quit;
+
 void supprime(char * ch) {
 	for (; *ch; ch++) {
 		*ch = *(ch + 1);
@@ -26,12 +28,13 @@ void inserer(char * ch, char c) {
 
 void ifloop(void) {
 	int cread, i, insert = 0;
-	int gotesc = 0, quit = 0;
+	int gotesc = 0;
 	char buffer[BUFSIZ] = "";
 	int position = 0;
 	
 	printf("> ");
-	
+
+	quit = 0;
 	while (!quit) {
 		cread = fgetc(input);
 		
@@ -96,6 +99,7 @@ void ifloop(void) {
 			printf("\n");
 			clearterm();
 			parse_line(buffer);
+			if (quit) break;
 			initterm();
 			position = 0;
 			buffer[0] = 0;
diff --git a/lib/pile.c b/lib/pile.c
index 55a0ff2..a42f75f 100644
--- a/lib/pile.c
+++ b/lib/pile.c
@@ -420,7 +420,6 @@ void act_pile(int func)
 								(ply_valuation
 								 (operande2.poly, rat_to_double(operande[0].poly->coef))),
 								0));
-
 						if (operande[0].poly)
 							ply_destruct(operande[0].poly);
 						ply_destruct(operande2.poly);
diff --git a/lib/scalaires.c b/lib/scalaires.c
index d55c4b2..b9af70a 100644
--- a/lib/scalaires.c
+++ b/lib/scalaires.c
@@ -16,7 +16,7 @@
 #define PRECISION 1E6
 typedisplay display;
 
-static int pgcd(int a, int b)
+static unsigned long long pgcd(unsigned long long a, unsigned long long b)
 {
 	if (a < b)
 		return pgcd(b, a);
@@ -35,7 +35,7 @@ rationnel rat_constr_zero(void)
 }
 
 
-rationnel rat_constr(int num, int denom)
+rationnel rat_constr(unsigned long long num, unsigned long long denom)
 {				/* cree une fraction */
 	rationnel temp;
 	int sgnnum = 1, sgndenom = 1;
@@ -64,10 +64,7 @@ rationnel rat_constr(int num, int denom)
 
 rationnel rat_constr_from_double(double flt)
 {				/* cree une fraction a partir d un double */
-
 	return rat_constr(floor(flt * PRECISION), PRECISION);
-
-
 }
 
 void rat_destruct(rationnel rat)
diff --git a/src/Polynom.c b/src/Polynom.c
index f9487e7..dea8eb8 100644
--- a/src/Polynom.c
+++ b/src/Polynom.c
@@ -78,8 +78,8 @@ int main(void)
 
     invite();
 
-    signal(SIGSEGV, segfaulthand);
-    signal(SIGINT, ctrlbreakhand);
+/*    signal(SIGSEGV, segfaulthand);
+    signal(SIGINT, ctrlbreakhand);*/
 
     fprintf(stderr, _("\nPerforming initialisation...\n\n"));
     init_all();