[Nice-commit] Nice/src/mlsub/typing/lowlevel DomainVector.java,1.7,1.8 K0.java,1.29,1.30 Satisfier.java,1.4,1.5

[Arjan B. <ar...@us...>]

Update of /cvsroot/nice/Nice/src/mlsub/typing/lowlevel
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11982/F:/nice/src/mlsub/typing/lowlevel

Modified Files:
	DomainVector.java K0.java Satisfier.java 
Log Message:
Copy constructor for DomainVector.

Index: K0.java
===================================================================
RCS file: /cvsroot/nice/Nice/src/mlsub/typing/lowlevel/K0.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** K0.java	31 Mar 2005 09:26:39 -0000	1.29
--- K0.java	1 Apr 2005 12:12:04 -0000	1.30
***************
*** 1359,1363 ****
  
        this.savedGarbage = new BitVector(K0.this.garbage);
!       this.savedDomains = (DomainVector)K0.this.domains.clone();
        /*
        this.savedImplementors = new BitVector[K0.this.nInterfaces()];
--- 1359,1363 ----
  
        this.savedGarbage = new BitVector(K0.this.garbage);
!       this.savedDomains = new DomainVector(K0.this.domains);
        /*
        this.savedImplementors = new BitVector[K0.this.nInterfaces()];
***************
*** 1792,1796 ****
          if (!garbage.get(excludedA) && simplified.get(excludedA)) {
            int x;
!           DomainVector savedDomains = (DomainVector)Sdomains.clone();
            try {
              if (S.debugSimpl) {
--- 1792,1796 ----
          if (!garbage.get(excludedA) && simplified.get(excludedA)) {
            int x;
!           DomainVector savedDomains = new DomainVector(Sdomains);
            try {
              if (S.debugSimpl) {

Index: DomainVector.java
===================================================================
RCS file: /cvsroot/nice/Nice/src/mlsub/typing/lowlevel/DomainVector.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** DomainVector.java	31 Mar 2005 09:26:39 -0000	1.7
--- DomainVector.java	1 Apr 2005 12:12:04 -0000	1.8
***************
*** 15,18 ****
--- 15,31 ----
    int width;                  // size of domains
    
+   public DomainVector(DomainVector old) {
+     super(old.size());
+     this.offset = old.offset;
+     this.width = old.width;
+     for (int i = 0; i < old.size(); i++) {
+       Domain d = ((Domain)old.get(i));
+       if (d != null)
+         add(new Domain(d));
+       else
+         add(null);
+     }
+   }
+ 
    public DomainVector(int offset, int width) {
      this.offset = offset;
***************
*** 97,111 ****
    }
  
-   public Object clone() {
-     DomainVector result = (DomainVector)super.clone();
-     for (int i = 0; i < size(); i++) {
-       Domain d = ((Domain)get(i));
-       if (d != null) {
-         result.set(i, new Domain(d));
-       }
-     }
-     return result;
-   }
- 
    /***********************************************************************
     * Fix-point computations
--- 110,113 ----

Index: Satisfier.java
===================================================================
RCS file: /cvsroot/nice/Nice/src/mlsub/typing/lowlevel/Satisfier.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Satisfier.java	30 Mar 2005 23:08:17 -0000	1.4
--- Satisfier.java	1 Apr 2005 12:12:05 -0000	1.5
***************
*** 49,53 ****
           a >= 0;
           a = dx.getNextBit(a)) {
!       DomainVector domainsCopy = (DomainVector)domains.clone();
        try {
          domainsCopy.getDomain(x).instantiate(a);
--- 49,53 ----
           a >= 0;
           a = dx.getNextBit(a)) {
!       DomainVector domainsCopy = new DomainVector(domains);
        try {
          domainsCopy.getDomain(x).instantiate(a);
***************
*** 94,98 ****
           a >= 0;
           a = dx.getNextBit(a)) {
!       DomainVector domainsCopy = (DomainVector)domains.clone();
        try {
          domainsCopy.getDomain(x).instantiate(a);
--- 94,98 ----
           a >= 0;
           a = dx.getNextBit(a)) {
!       DomainVector domainsCopy = new DomainVector(domains);
        try {
          domainsCopy.getDomain(x).instantiate(a);