Project

General

Profile

reg.patch

Șerban Bursuc, 10/30/2025 09:34 AM

Download (4.54 KB)

View differences:

new/src/com/goldencode/p2j/util/BaseDataType.java 2025-10-28 11:43:59 +0000
697 697
    */
698 698
   public BaseDataType maximum(BaseDataType b)   
699 699
   {
700
      b = b.val();
701

  
700 702
      if (isUnknown() || b.isUnknown())
701 703
         return instantiateUnknown();
702 704
      
......
713 715
    */
714 716
   public BaseDataType minimum(BaseDataType b)   
715 717
   {
718
      b = b.val();
719

  
716 720
      if (isUnknown() || b.isUnknown())
717 721
         return instantiateUnknown();
718 722
      
new/src/com/goldencode/p2j/util/CompareOps.java 2025-10-28 12:22:10 +0000
163 163
         return null;
164 164
      }
165 165
      
166
      BaseDataType largest = list[0];
166
      BaseDataType largest = list[0].val();
167 167
      
168 168
      for (int i = 1; i < list.length; i++)
169 169
      {
......
192 192
         return null;
193 193
      }
194 194
      
195
      BaseDataType smallest = list[0];
195
      BaseDataType smallest = list[0].val();
196 196
      
197 197
      for (int i = 1; i < list.length; i++)
198 198
      {
......
212 212
    */
213 213
   public static boolean _isUnknown(BaseDataType op)
214 214
   {
215
      return op.isUnknown();
215
      return op.val().isUnknown();
216 216
   }
217 217

  
218 218
   /**
......
253 253
    */
254 254
   public static logical isUnknown(BaseDataType op)
255 255
   {
256
      return logical.of(op.isUnknown());
256
      return logical.of(op.val().isUnknown());
257 257
   }
258 258
   
259 259
   /**
......
308 308
    */
309 309
   public static boolean _notUnknown(BaseDataType op)
310 310
   {
311
      return !op.isUnknown();
311
      return !op.val().isUnknown();
312 312
   }
313 313
   
314 314
   /**
......
351 351
    */
352 352
   public static logical notUnknown(BaseDataType op)
353 353
   {
354
      return logical.of(!op.isUnknown());
354
      return logical.of(!op.val().isUnknown());
355 355
   }
356 356
   
357 357
   /**
......
396 396
    */
397 397
   public static boolean equals(BaseDataType op1, BaseDataType op2)
398 398
   {
399
      op1 = op1.val();
400
      op2 = op2.val();
401

  
399 402
      boolean u1 = op1.isUnknown();
400 403
      boolean u2 = op2.isUnknown();
401 404
      
......
462 465
    */
463 466
   public static boolean _isEqual(WrappedResource op1, BaseDataType op2)
464 467
   {
465
      return equals(new handle(op1), op2);
468
      return equals(new handle(op1), op2.val());
466 469
   }
467 470
      
468 471
   /**
......
478 481
    */
479 482
   public static boolean _isEqual(BaseDataType op1, WrappedResource op2)
480 483
   {
481
      return equals(op1, new handle(op2));
484
      return equals(op1.val(), new handle(op2));
482 485
   }
483 486
      
484 487
   /**
......
1505 1508
    */
1506 1509
   public static boolean greaterThan(BaseDataType op1, BaseDataType op2)
1507 1510
   {
1511
      op1 = op1.val();
1512
      op2 = op2.val();
1513

  
1508 1514
      boolean u1 = op1.isUnknown();
1509 1515
      boolean u2 = op2.isUnknown(); 
1510 1516
      
......
1770 1776
    */
1771 1777
   public static logical isGreaterThan(BaseDataType op1, BaseDataType op2)
1772 1778
   {
1779
      op1 = op1.val();
1780
      op2 = op2.val();
1781

  
1773 1782
      boolean u1 = op1.isUnknown();
1774 1783
      boolean u2 = op2.isUnknown(); 
1775 1784
      
......
2028 2037
    */
2029 2038
   public static boolean greaterThanOrEqual(BaseDataType op1, BaseDataType op2)
2030 2039
   {
2040
      op1 = op1.val();
2041
      op2 = op2.val();
2042

  
2031 2043
      boolean u1 = op1.isUnknown();
2032 2044
      boolean u2 = op2.isUnknown(); 
2033 2045
      
......
2312 2324
    */
2313 2325
   public static logical isGreaterThanOrEqual(BaseDataType op1, BaseDataType op2)
2314 2326
   {
2327
      op1 = op1.val();
2328
      op2 = op2.val();
2329

  
2315 2330
      boolean u1 = op1.isUnknown();
2316 2331
      boolean u2 = op2.isUnknown(); 
2317 2332
      
......
2572 2587
    */
2573 2588
   public static boolean lessThan(BaseDataType op1, BaseDataType op2)
2574 2589
   {
2590
      op1 = op1.val();
2591
      op2 = op2.val();
2592

  
2575 2593
      boolean u1 = op1.isUnknown();
2576 2594
      boolean u2 = op2.isUnknown(); 
2577 2595
      
......
2839 2857
    */
2840 2858
   public static logical isLessThan(BaseDataType op1, BaseDataType op2)
2841 2859
   {
2860
      op1 = op1.val();
2861
      op2 = op2.val();
2862

  
2842 2863
      boolean u1 = op1.isUnknown();
2843 2864
      boolean u2 = op2.isUnknown(); 
2844 2865
      
......
3097 3118
    */
3098 3119
   public static boolean lessThanOrEqual(BaseDataType op1, BaseDataType op2)
3099 3120
   {
3121
      op1 = op1.val();
3122
      op2 = op2.val();
3123

  
3100 3124
      boolean u1 = op1.isUnknown();
3101 3125
      boolean u2 = op2.isUnknown(); 
3102 3126
      
......
3380 3404
    */
3381 3405
   public static logical isLessThanOrEqual(BaseDataType op1, BaseDataType op2)
3382 3406
   {
3407
      op1 = op1.val();
3408
      op2 = op2.val();
3409

  
3383 3410
      boolean u1 = op1.isUnknown();
3384 3411
      boolean u2 = op2.isUnknown(); 
3385 3412