===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/builtin/dp.c,v
retrieving revision 1.27
retrieving revision 1.30
diff -u -p -r1.27 -r1.30
--- OpenXM_contrib2/asir2000/builtin/dp.c	2003/01/06 01:16:37	1.27
+++ OpenXM_contrib2/asir2000/builtin/dp.c	2003/04/25 01:31:11	1.30
@@ -45,7 +45,7 @@
  * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE,
  * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE.
  *
- * $OpenXM: OpenXM_contrib2/asir2000/builtin/dp.c,v 1.26 2003/01/04 09:06:15 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/builtin/dp.c,v 1.29 2003/04/21 02:49:40 noro Exp $ 
 */
 #include "ca.h"
 #include "base.h"
@@ -61,6 +61,7 @@ int do_weyl;
 void Pdp_ord(), Pdp_ptod(), Pdp_dtop();
 void Pdp_ptozp(), Pdp_ptozp2(), Pdp_red(), Pdp_red2(), Pdp_lcm(), Pdp_redble();
 void Pdp_sp(), Pdp_hm(), Pdp_ht(), Pdp_hc(), Pdp_rest(), Pdp_td(), Pdp_sugar();
+void Pdp_set_sugar();
 void Pdp_cri1(),Pdp_cri2(),Pdp_subd(),Pdp_mod(),Pdp_red_mod(),Pdp_tdiv();
 void Pdp_prim(),Pdp_red_coef(),Pdp_mag(),Pdp_set_kara(),Pdp_rat();
 void Pdp_nf(),Pdp_true_nf();
@@ -72,7 +73,7 @@ void Pdp_gr_mod_main(),Pdp_gr_f_main();
 void Pdp_gr_main(),Pdp_gr_hm_main(),Pdp_gr_d_main(),Pdp_gr_flags();
 void Pdp_f4_main(),Pdp_f4_mod_main(),Pdp_f4_f_main();
 void Pdp_gr_print();
-void Pdp_mbase(),Pdp_lnf_mod(),Pdp_nf_tab_mod(),Pdp_mdtod();
+void Pdp_mbase(),Pdp_lnf_mod(),Pdp_nf_tab_mod(),Pdp_mdtod(), Pdp_nf_tab_f();
 void Pdp_vtoe(), Pdp_etov(), Pdp_dtov(), Pdp_idiv(), Pdp_sep();
 void Pdp_cont();
 void Pdp_gr_checklist();
@@ -114,6 +115,7 @@ struct ftab dp_tab[] = {
 	{"dp_nf_mod",Pdp_nf_mod,5},
 	{"dp_true_nf_mod",Pdp_true_nf_mod,5},
 	{"dp_lnf_mod",Pdp_lnf_mod,3},
+	{"dp_nf_tab_f",Pdp_nf_tab_f,2},
 	{"dp_nf_tab_mod",Pdp_nf_tab_mod,3},
 	{"dp_lnf_f",Pdp_lnf_f,2},
 
@@ -195,6 +197,7 @@ struct ftab dp_supp_tab[] = {
 	{"dp_td",Pdp_td,1},
 	{"dp_mag",Pdp_mag,1},
 	{"dp_sugar",Pdp_sugar,1},
+	{"dp_set_sugar",Pdp_set_sugar,2},
 
 	/* misc */
 	{"dp_mbase",Pdp_mbase,1},
@@ -377,6 +380,15 @@ DP *rp;
 		QTOS((Q)ARG2(arg)),rp);
 }
 
+void Pdp_nf_tab_f(arg,rp)
+NODE arg;
+DP *rp;
+{
+	asir_assert(ARG0(arg),O_DP,"dp_nf_tab_f");
+	asir_assert(ARG1(arg),O_VECT,"dp_nf_tab_f");
+	dp_nf_tab_f((DP)ARG0(arg),(LIST *)BDY((VECT)ARG1(arg)),rp);
+}
+
 void Pdp_ord(arg,rp)
 NODE arg;
 Obj *rp;
@@ -1014,6 +1026,27 @@ Q *rp;
 		STOQ(p->sugar,*rp);
 }
 
+void Pdp_set_sugar(arg,rp)
+NODE arg;
+Q *rp;
+{
+	DP p;
+	Q q;
+	int i;
+
+	p = (DP)ARG0(arg);
+	q = (Q)ARG1(arg);
+	if ( p && q) {
+		asir_assert(p,O_DP,"dp_set_sugar");
+		asir_assert(q,O_N, "dp_set_sugar");
+		i = QTOS(q);
+		if (p->sugar < i) {
+			p->sugar = i;
+		}
+	}
+	*rp = 0;
+}
+
 void Pdp_cri1(arg,rp)
 NODE arg;
 Q *rp;
@@ -1215,19 +1248,38 @@ LIST *rp;
 	dp_make_flaglist(rp);
 }
 
-extern int DP_Print;
+extern int DP_Print, DP_PrintShort;
 
 void Pdp_gr_print(arg,rp)
 NODE arg;
 Q *rp;
 {
 	Q q;
+	int s;
 
 	if ( arg ) {
 		asir_assert(ARG0(arg),O_N,"dp_gr_print");
-		q = (Q)ARG0(arg); DP_Print = QTOS(q);
-	} else
-		STOQ(DP_Print,q);
+		q = (Q)ARG0(arg);
+		s = QTOS(q);
+		switch ( s ) {
+			case 0:
+				DP_Print = 0; DP_PrintShort = 0;
+				break;
+			case 1:
+				DP_Print = 1;
+				break;
+			case 2: default:
+				DP_Print = 0; DP_PrintShort = 1;
+				break;
+		}
+	} else {
+		if ( DP_Print )	{
+			STOQ(1,q);
+		} else if ( DP_PrintShort ) {
+			STOQ(2,q);
+		} else
+			q = 0;
+	}
 	*rp = q;
 }