Changeset 58b2638

Timestamp:

Dec 2, 2021, 5:11:22 PM (3 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, ast-experimental, enum, forall-pointer-decay, master, pthread-emulation, qualifiedEnum

Children:

8e658241

Parents:

1894e03

Message:

Added range_iterator, it now compiles.

Location:

libcfa/src

Files:

• Makefile.am (modified) (1 diff)
• algorithms/range_iterator.cfa (modified) (2 diffs)
• algorithms/range_iterator.hfa (modified) (2 diffs)

libcfa/src/Makefile.am

@@ -84 +84 @@
         time.hfa \
         bits/weakso_locks.hfa \
+        algorithms/range_iterator.hfa \
         containers/maybe.hfa \
         containers/pair.hfa \

libcfa/src/algorithms/range_iterator.cfa

@@ -14 +14 @@
 //
 
+#include "range_iterator.hfa"
 
+#include <stdio.h>
 
-void main(RangeParser & this) {
+#include <fstream.hfa>
+
+void main(RangeIter & this) {
         for() {
                 this._start = -1;
                 this._stop = -1;
                 int start_len = -1, stop_len = -1;
-                int ret = sscanf(this.text, "%u%n-%u%n", &this._start, &start_len, &stop, &stop_len);
+                int ret = sscanf(this.text, "%u%n-%u%n", &this._start, &start_len, &this._stop, &stop_len);
                 switch(ret) {
                 case 0:
@@ -44 +48 @@
                         }
                         this.text += stop_len;
-                        for(this.com i = this._start; this.com <= this._stop; this.com++) {
+                        for(this.com = this._start; this.com <= this._stop; this.com++) {
                                 suspend;
                         }

libcfa/src/algorithms/range_iterator.hfa

@@ -17 +17 @@
         const char * text;
         int com;
-        int
+        int _start;
+        int _stop;
 };
 
@@ -24 +25 @@
 }
 
-static inline bool next(RangeIter & this) { return resume(this).com > 0; }
+static inline bool moveNext(RangeIter & this) { resume(this); return this.com > 0; }