Commit: aba28c7a09dcd0a89f1553aca63a956483c7a825 - star (git)

Commit MetaInfo

• Revision: aba28c7a09dcd0a89f1553aca63a956483c7a825 (tree)
• Time: 2020-11-20 22:00:33
• Author: dhrname <dhrname@user...>
• Commiter: dhrname

Log Message

Add this pointer

Change Summary

• modified: joestar/cpp/Makefile
• modified: joestar/cpp/main.cpp
• modified: source_code/exception.o
• modified: source_code/item.o
• modified: source_code/ntree.o
• modified: source_code/pair.c
• modified: source_code/pair.o
• delete: source_code/profile.txt
• modified: source_code/shadowstar.o
• modified: source_code/star.h
• modified: source_code/star.o
• modified: source_code/startest.o

Incremental Difference

--- a/joestar/cpp/Makefile
+++ b/joestar/cpp/Makefile
@@ -4,7 +4,7 @@ NODEBUGMODE = -std=c++20
 SHELL = /bin/sh
 
 
-all : main joestar.exe
+all : joestar.exe
 .PHONY : all
 
 

--- a/joestar/cpp/main.cpp
+++ b/joestar/cpp/main.cpp
@@ -35,9 +35,10 @@ public:
   virtual Node* getPrev() = 0;
   virtual Node* getFirstChild() = 0;
   virtual Node* getLastChild() = 0;
+  virtual Node* removeChild(Node*) = 0;
   virtual Node* insertBefore(Node*) = 0;
   virtual Node* appendChild(Node*) = 0;
-  virtual bool isNode() const = 0;
+  virtual bool isNode() = 0;
 };
 
 /*空のノードクラス*/
@@ -49,9 +50,10 @@ public:
   Node* getPrev(){return this;};
   Node* getFirstChild(){return this;};
   Node* getLastChild(){return this;};
+  Node* removeChild(Node*){return this;};
   Node* insertBefore(Node*){return this;};
   Node* appendChild(Node*){return this;};
-  bool isNode() const
+  bool isNode()
   {
       return false;
   }
@@ -61,7 +63,7 @@ Node* const emptynode = new EmptyNode();
 
 /*BaseNodeの基底クラス
  * Node抽象クラスに対する内部実装*/
-class BaseNode: public Node
+class BaseNode: public EmptyNode
 {
 private:
   Node* parentNode;
@@ -86,7 +88,15 @@ public:
   virtual void setPrev(Node* node);
   virtual void setFirstChild(Node* node);
   virtual void setLastChild(Node* node);
-  bool isNode()
+  virtual Node* getParent();
+  virtual Node* getNext();
+  virtual Node* getPrev();
+  virtual Node* getFirstChild();
+  virtual Node* getLastChild();
+  virtual Node* removeChild(Node*);
+  virtual Node* insertBefore(Node*);
+  virtual Node* appendChild(Node*);
+  virtual bool isNode()
   {
       return true;
   }
@@ -95,24 +105,57 @@ public:
 
 
 void BaseNode::setParent(Node* node){
-  parentNode = node;
+  this->parentNode = node;
 }
 void BaseNode::setNext(Node* node){
-  nextSibling = node;
+  this->nextSibling = node;
 }
 void BaseNode::setPrev(Node* node){
-  previousSibling = node;
+  this->previousSibling = node;
 }
 void BaseNode::setFirstChild(Node* node){
-  firstChild = node;
+  this->firstChild = node;
 }
 void BaseNode::setLastChild(Node* node){
-  lastChild = node;
+  this->lastChild = node;
+}
+
+Node* BaseNode::getParent()
+{
+  return this->parentNode;
+}
+Node* BaseNode::getNext()
+{
+  return this->nextSibling;
+}
+Node* BaseNode::getPrev()
+{
+  return this->previousSibling;
+}
+Node* BaseNode::getFirstChild()
+{
+  return this->firstChild;
+}
+Node* BaseNode::getLastChild()
+{
+  return this->lastChild;
+}
+Node* BaseNode::removeChild(Node* const node)
+{
+  return this->parentNode;
+}
+Node* BaseNode::insertBefore(Node* const node)
+{
+  return this->parentNode;
+}
+Node* BaseNode::appendChild(Node* const node)
+{
+  return this->parentNode;
 }
 
 int main(int argc, char **argv)
 {
-	std::string str1 = "ABCDE";
+	std::string str1 = "ABCD";
     std::cout << str1 << std::endl;
 	return 0;
 }

Binary files a/source_code/exception.o and b/source_code/exception.o differ

Binary files a/source_code/item.o and b/source_code/item.o differ

Binary files a/source_code/ntree.o and b/source_code/ntree.o differ

--- a/source_code/pair.c
+++ b/source_code/pair.c
@@ -101,7 +101,6 @@ void *ST_emalloc(size_t n)
     p = calloc(1, n);
     if (p == NULL)
     {
-        errno = ENOBUFS;
         eprintf("%u bytes failed on the function ST_emalloc:", n);
     }
     return p;

Binary files a/source_code/pair.o and b/source_code/pair.o differ

--- a/source_code/profile.txt
+++ /dev/null
@@ -1,136 +0,0 @@
-Flat profile:
-
-Each sample counts as 0.01 seconds.
-  %   cumulative   self              self     total           
- time   seconds   seconds    calls  Ts/call  Ts/call  name    
-
- %         the percentage of the total running time of the
-time       program used by this function.
-
-cumulative a running sum of the number of seconds accounted
- seconds   for by this function and those listed above it.
-
- self      the number of seconds accounted for by this
-seconds    function alone.  This is the major sort for this
-           listing.
-
-calls      the number of times this function was invoked, if
-           this function is profiled, else blank.
- 
- self      the average number of milliseconds spent in this
-ms/call    function per call, if this function is profiled,
-	   else blank.
-
- total     the average number of milliseconds spent in this
-ms/call    function and its descendents per call, if this 
-	   function is profiled, else blank.
-
-name       the name of the function.  This is the minor sort
-           for this listing. The index shows the location of
-	   the function in the gprof listing. If the index is
-	   in parenthesis it shows where it would appear in
-	   the gprof listing if it were to be printed.
-
-Copyright (C) 2012-2014 Free Software Foundation, Inc.
-
-Copying and distribution of this file, with or without modification,
-are permitted in any medium without royalty provided the copyright
-notice and this notice are preserved.
-
-		     Call graph (explanation follows)
-
-
-granularity: each sample hit covers 4 byte(s) no time propagated
-
-index % time    self  children    called     name
-
- This table describes the call tree of the program, and was sorted by
- the total amount of time spent in each function and its children.
-
- Each entry in this table consists of several lines.  The line with the
- index number at the left hand margin lists the current function.
- The lines above it list the functions that called this function,
- and the lines below it list the functions this one called.
- This line lists:
-     index	A unique number given to each element of the table.
-		Index numbers are sorted numerically.
-		The index number is printed next to every function name so
-		it is easier to look up where the function is in the table.
-
-     % time	This is the percentage of the `total' time that was spent
-		in this function and its children.  Note that due to
-		different viewpoints, functions excluded by options, etc,
-		these numbers will NOT add up to 100%.
-
-     self	This is the total amount of time spent in this function.
-
-     children	This is the total amount of time propagated into this
-		function by its children.
-
-     called	This is the number of times the function was called.
-		If the function called itself recursively, the number
-		only includes non-recursive calls, and is followed by
-		a `+' and the number of recursive calls.
-
-     name	The name of the current function.  The index number is
-		printed after it.  If the function is a member of a
-		cycle, the cycle number is printed between the
-		function's name and the index number.
-
-
- For the function's parents, the fields have the following meanings:
-
-     self	This is the amount of time that was propagated directly
-		from the function into this parent.
-
-     children	This is the amount of time that was propagated from
-		the function's children into this parent.
-
-     called	This is the number of times this parent called the
-		function `/' the total number of times the function
-		was called.  Recursive calls to the function are not
-		included in the number after the `/'.
-
-     name	This is the name of the parent.  The parent's index
-		number is printed after it.  If the parent is a
-		member of a cycle, the cycle number is printed between
-		the name and the index number.
-
- If the parents of the function cannot be determined, the word
- `<spontaneous>' is printed in the `name' field, and all the other
- fields are blank.
-
- For the function's children, the fields have the following meanings:
-
-     self	This is the amount of time that was propagated directly
-		from the child into the function.
-
-     children	This is the amount of time that was propagated from the
-		child's children to the function.
-
-     called	This is the number of times the function called
-		this child `/' the total number of times the child
-		was called.  Recursive calls by the child are not
-		listed in the number after the `/'.
-
-     name	This is the name of the child.  The child's index
-		number is printed after it.  If the child is a
-		member of a cycle, the cycle number is printed
-		between the name and the index number.
-
- If there are any cycles (circles) in the call graph, there is an
- entry for the cycle-as-a-whole.  This entry shows who called the
- cycle (as parents) and the members of the cycle (as children.)
- The `+' recursive calls entry shows the number of function calls that
- were internal to the cycle, and the calls entry for each member shows,
- for that member, how many times it was called from other members of
- the cycle.
-
-Copyright (C) 2012-2014 Free Software Foundation, Inc.
-
-Copying and distribution of this file, with or without modification,
-are permitted in any medium without royalty provided the copyright
-notice and this notice are preserved.
-
-Index by function name
-

Binary files a/source_code/shadowstar.o and b/source_code/shadowstar.o differ

--- a/source_code/star.h
+++ b/source_code/star.h
@@ -19,8 +19,6 @@
 #include <float.h>
 #include <assert.h>
 #include <setjmp.h>
-#include <unistd.h>
-#include <sys/time.h>
 #include <fcntl.h>
 #include <signal.h>
 

Binary files a/source_code/star.o and b/source_code/star.o differ

Binary files a/source_code/startest.o and b/source_code/startest.o differ