Merge branch 'master' into public

[spa1skripta-public.git] / kodovi / polinomi / polinom.MOD

diff --git a/kodovi/polinomi/polinom.MOD b/kodovi/polinomi/polinom.MOD
index 3e46e54..cfba1b1 100644 (file)
--- a/kodovi/polinomi/polinom.MOD
+++ b/kodovi/polinomi/polinom.MOD
@@ -1,11 +1,10 @@
 MODULE polinom;\r
 FROM PolinomL IMPORT Polinom, Stampaj, Anuliraj,\r
-              DisposePolinom, UbaciMonom, Unos, Saberi;\r
+              DisposePolinom, PostaviClan, Unos, Saberi;\r
 FROM InOut IMPORT WriteString, WriteLn;\r
-FROM Storage IMPORT ALLOCATE, DEALLOCATE;\r
 \r
 VAR\r
-  p,q,rez,pom : Polinom;\r
+  p,q,rez : Polinom;\r
 \r
 BEGIN\r
   (* korisnik unosi prvi polinom *)\r
@@ -15,31 +14,14 @@ BEGIN
   (* drugi polinom kreiramo mi, \r
      monom po monom *)\r
   Anuliraj(q); (* isto sto i q:=NIL; *)\r
-  (* formiramo monom x^5 *)\r
-  NEW(pom);\r
-  pom^.st:=5;\r
-  pom^.k:=1.0;\r
-  (* dodajemo ga u polinom *)\r
-  UbaciMonom(pom,q);\r
-  DISPOSE(pom);\r
+  (* postavimo clan x^5 *)\r
+  PostaviClan(1.0,5,q);\r
   (* -3 x^4 *)\r
-  NEW(pom);\r
-  pom^.st := 4;\r
-  pom^.k := -3.0;\r
-  UbaciMonom(pom,q);\r
-  DISPOSE(pom);\r
+  PostaviClan(-3.0,4,q);\r
   (* 4 x *)\r
-  NEW(pom);\r
-  pom^.st := 1;\r
-  pom^.k := 4.0;\r
-  UbaciMonom(pom,q);\r
-  DISPOSE(pom);\r
+  PostaviClan(4.0,1,q);\r
   (* 7 (x^0) *)\r
-  NEW(pom);\r
-  pom^.st := 0;\r
-  pom^.k := 7.0;\r
-  UbaciMonom(pom,q);\r
-  DISPOSE(pom);\r
+  PostaviClan(7.0,0,q);\r
   (* saberemo polinome *)\r
   Saberi(p, q, rez);\r
   (* odstampamo rezultat i polinome *)\r