From d272d985ca8dc3c916024c33e78323cf98c3aa1b Mon Sep 17 00:00:00 2001
From: harasz31 <59858062+harasz31@users.noreply.github.com>
Date: Sun, 9 Feb 2020 20:04:49 +0700
Subject: [PATCH] harasz31

---
 ASD_Task_2.layout | 14 ++++++------
 list.cpp          | 56 ++++++++++++++++++++++++++++++++++++++++-------
 list.h            |  5 +++--
 operation.cpp     | 11 ++++++++++
 4 files changed, 69 insertions(+), 17 deletions(-)

diff --git a/ASD_Task_2.layout b/ASD_Task_2.layout
index e69ac9c..7742588 100644
--- a/ASD_Task_2.layout
+++ b/ASD_Task_2.layout
@@ -2,24 +2,24 @@
 <CodeBlocks_layout_file>
 	<FileVersion major="1" minor="0" />
 	<ActiveTarget name="Debug" />
-	<File name="operation.cpp" open="1" top="0" tabpos="5" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+	<File name="list.h" open="1" top="0" tabpos="2" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
 		<Cursor>
-			<Cursor1 position="656" topLine="0" />
+			<Cursor1 position="663" topLine="27" />
 		</Cursor>
 	</File>
 	<File name="Main.cpp" open="1" top="0" tabpos="4" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
 		<Cursor>
-			<Cursor1 position="837" topLine="23" />
+			<Cursor1 position="2649" topLine="82" />
 		</Cursor>
 	</File>
-	<File name="list.h" open="1" top="1" tabpos="2" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+	<File name="list.cpp" open="1" top="0" tabpos="3" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
 		<Cursor>
-			<Cursor1 position="151" topLine="0" />
+			<Cursor1 position="3424" topLine="146" />
 		</Cursor>
 	</File>
-	<File name="list.cpp" open="1" top="0" tabpos="3" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+	<File name="operation.cpp" open="1" top="1" tabpos="5" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
 		<Cursor>
-			<Cursor1 position="214" topLine="117" />
+			<Cursor1 position="958" topLine="11" />
 		</Cursor>
 	</File>
 	<File name="operation.h" open="1" top="0" tabpos="1" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
diff --git a/list.cpp b/list.cpp
index f61d73d..fe56e71 100644
--- a/list.cpp
+++ b/list.cpp
@@ -6,6 +6,7 @@ void createList(List &L) {
     */
     //-------------your code here-------------
     cout<<"your code here"<<endl;
+    first(L) = NULL;
 
 
     //----------------------------------------
@@ -19,7 +20,9 @@ address allocate(infotype x) {
     address P = NULL;
     //-------------your code here-------------
     cout<<"your code here"<<endl;
-
+    P = new elmlist;
+    info(P) = x;
+    next(P) = NULL;
 
     //----------------------------------------
     return P;
@@ -31,6 +34,7 @@ void deallocate(address &P) {
     */
     //-------------your code here-------------
     cout<<"your code here"<<endl;
+    delete(P);
 
 
     //----------------------------------------
@@ -43,7 +47,8 @@ void insertFirst(List &L, address P) {
     */
     //-------------your code here-------------
     cout<<"your code here"<<endl;
-
+    next(P) = first(L);
+    first(L) = P;
 
 
     //----------------------------------------
@@ -56,7 +61,16 @@ void insertLast(List &L, address P) {
     */
     //-------------your code here-------------
     cout<<"your code here"<<endl;
-
+    address Q;
+    Q = first(L);
+    if (Q == NULL){
+        first(L) = P;
+    } else {
+        while (next(Q) != NULL){
+            Q = next(Q);
+        }
+        next(Q) = P;
+    }
 
     //----------------------------------------
 }
@@ -71,7 +85,10 @@ address findElm(List L, infotype x) {
     address P;
     //-------------your code here-------------
     cout<<"your code here"<<endl;
-
+    P = first(L);
+    while (P != NULL && info(P) != x){
+        P = next(P);
+    }
 
     //----------------------------------------
     return P;
@@ -84,7 +101,11 @@ void deleteFirst(List &L, address &P) {
     */
     //-------------your code here-------------
     cout<<"your code here"<<endl;
-
+    if (first(L) != NULL){
+        P = first(L);
+        first(L) = next(P);
+        next(P) = NULL;
+    }
 
 
     //----------------------------------------
@@ -97,7 +118,17 @@ void deleteLast(List &L, address &P) {
     */
     //-------------your code here-------------
     cout<<"your code here"<<endl;
-
+    address Q;
+    Q = first(L);
+    if (next(Q) == NULL){
+        deleteFirst(L, P);
+    } else {
+        while (next(next(Q)) != NULL){
+            Q = next(Q);
+        }
+        P = next(Q);
+        next(Q) = NULL;
+    }
 
 
     //----------------------------------------
@@ -110,7 +141,12 @@ void printInfo(List L) {
     */
     //-------------your code here-------------
     cout<<"your code here"<<endl;
-
+    address P;
+    P = first(L);
+    while (P != NULL){
+        cout<<info(P)<<", ";
+        P = next(P);
+    }
 
     //----------------------------------------
     cout<<endl;
@@ -125,6 +161,8 @@ void insertAfter(List &L, address Prec, address P) {
     */
     //-------------your code here-------------
     cout<<"your code here"<<endl;
+    next(P) = next(Prec);
+    next(Prec) = P;
 
     //----------------------------------------
 
@@ -137,7 +175,9 @@ void deleteAfter(List &L, address Prec, address &P) {
     */
     //-------------your code here-------------
     cout<<"your code here"<<endl;
-
+    P = next(Prec);
+    next(Prec) = next(P);
+    next(P) = NULL;
 
     //----------------------------------------
 }
diff --git a/list.h b/list.h
index d021225..7fa1378 100644
--- a/list.h
+++ b/list.h
@@ -30,14 +30,15 @@ typedef struct elmlist *address;
 
 struct elmlist{
     //------------- your code here -----------
-
+    infotype info;
+    address next;
 
     //----------------------------------------
 };
 
 struct List{
     //------------- your code here -----------
-
+    address first;
     //----------------------------------------
 };
 
diff --git a/operation.cpp b/operation.cpp
index 0a0e067..53893e3 100644
--- a/operation.cpp
+++ b/operation.cpp
@@ -14,6 +14,17 @@ void insert_sorted(List &L, infotype x) {
 
     //-------------your code here-------------
     cout<<"your code here"<<endl;
+    address P, Q;
+    P = first(L);
+    if (P == NULL || info(P) > x){
+        insertFirst(L, allocate(x));
+    } else if (findElm(L, x) == NULL){
+        while (P != NULL && info(P) < x){
+            Q = P;
+            P = next(P);
+        }
+        insertAfter(L, Q, allocate(x));
+    }
 
 
     //----------------------------------------