added some methods

Author: Phelsong

pixi.toml

@@ -8,9 +8,9 @@ version = "1.2.1"
 
 [tasks]
 test = "mojo test tests/mojo_csv"
-test-dev = "mojo test tests/dev"
+test-dev = "mojo test_parse.mojo"
 format = { cmd = "mojo format -l 88 ." }
-prep = { depends-on = ["format", "test"] }
+prep = { depends-on = ["format", "test-dev"] }
 pack = "mojo package src -o .pixi/envs/default/lib/mojo/mojo_csv.mojopkg;cp .pixi/envs/default/lib/mojo/mojo_csv.mojopkg dist; sha256sum dist/mojo_csv.mojopkg > dist/sha256sum.mojo_csv.mojopkg.txt;"
 test-build = { cmd = "rattler-build build --channel https://prefix.dev/modular-community --channel https://conda.modular.com/max --channel conda-forge --variant-config tests/variants.yaml --skip-existing=all --recipe tests/recipe.yaml", env = {MODULAR_MOJO_IMPORT_PATH = "$CONDA_PREFIX/lib/mojo"} }
 

src/csv_reader.mojo

@@ -6,8 +6,8 @@ from testing import assert_true
 
 # https://www.rfc-editor.org/rfc/rfc4180
 #
-@value
-struct CsvReader:
+@fieldwise_init
+struct CsvReader(Copyable, Representable, Sized, Stringable, Writable):
     # var data: Dict[String,String]
     var headers: List[String]
     var elements: List[String]
@@ -20,13 +20,15 @@ struct CsvReader:
     var row_count: Int
     var col_count: Int
     var length: Int
+    var index: Int
 
     fn __init__(
         out self,
         owned in_csv: Path,
         owned delimiter: String = ",",
         owned quotation_mark: String = '"',
     ) raises:
+        self.index = 0
         self.raw = ""
         self.raw_length = 0
         self.length = 0
@@ -120,22 +122,35 @@ struct CsvReader:
     fn __len__(self) -> Int:
         return self.length
 
-    # fn __iter__(self) -> collection:
-    #     return self.elements.__iter__()
-
-    # fn __repr__(self) -> String:
-    #     var out: String = "["
-    #     for el in self.elements:
-    #         out.append(el)
-    #     out.append("]")
-    #     return out
-
-    # fn __copyinit__(out self) -> CsvReader:
-    #     self.raw = existing.raw
-    #     self.delimiter = existing.delimiter
-    #     self.QM = existing.QM
-    #     self.elements = existing.elements
-    #     self.col_count = existing.col_count
-    #     self.row_count = existing.row_count
-    #     return self
-    # ---------------------
+    fn __repr__(self) -> String:
+        var out: String = "["
+
+        for el in self.elements:
+            out += "'"
+            out += String(el)
+            out += "', "
+        out += "]"
+        return out
+
+    fn __str__(self) -> String:
+        return String.write(self)
+
+    fn write_to[W: Writer](self, mut writer: W) -> None:
+        writer.write(String("CsvReader" + repr(self)))
+
+    @parameter
+    fn __next_ref__(mut self) -> String:
+        self.index += 1
+        return self.elements[self.index - 1]
+
+    @always_inline
+    fn __next__(mut self) -> String:
+        return self.__next_ref__()
+
+    @always_inline
+    fn __has_next__(self) -> Bool:
+        return self.length > self.index
+
+    @always_inline
+    fn __iter__(self) -> Self:
+        return self

tests/dev/test_parse.mojo test_parse.mojotests/dev/test_parse.mojo renamed to test_parse.mojo

@@ -4,20 +4,19 @@ from testing import assert_true
 
 from src.csv_reader import CsvReader
 
-var VALID = List[String](
-    "item1",
-    "item2",
-    '"ite,em3"',
-    '"p""ic"',
-    " pi c",
-    "pic",
-    "r_i_1",
-    '"r_i_2"""',
-    "r_i_3",
-)
 
-
-fn test_parse() raises:
+fn main() raises:
+    var VALID = List[String](
+        "item1",
+        "item2",
+        '"ite,em3"',
+        '"p""ic"',
+        " pi c",
+        "pic",
+        "r_i_1",
+        '"r_i_2"""',
+        "r_i_3",
+    )
     var in_csv: Path = cwd().joinpath("tests/test.csv")
     var rd = CsvReader(in_csv)
     # print(rd)
@@ -39,11 +38,27 @@ fn test_parse() raises:
         assert_true(rd.row_count == 3)
         print("elements:", rd.__len__(), "of 9")
         assert_true(len(rd.elements) == 9)
+        t_methods(rd)
 
-        # for x in rd:
-        # print(x)
     except AssertionError:
-        print(AssertionError)
+        # print(AssertionError)
         raise AssertionError
     print("----------")
     print("parse successful")
+
+
+fn t_methods(rd: CsvReader) raises:
+    try:
+        print(String("repr: {}").format(repr(rd)))
+        print(String("len: {}").format(len(rd)))
+        print(String("print: {}").format(rd))
+        print(String("slice: {}").format(rd[0]))
+        print(String("slice repr: {}").format(repr(rd[0])))
+        print("iter: ...")
+        print("----")
+        for x in rd:
+            print(x)
+        print("----")
+    except:
+        print("error")
+        raise

tests/mojo_csv/test_methods.mojo

@@ -0,0 +1,21 @@
+from pathlib import Path, cwd
+from sys import argv, exit
+from testing import assert_true
+
+from mojo_csv import CsvReader
+
+
+fn test_methods() raises:
+    try:
+        var in_csv: Path = cwd().joinpath("tests/test.csv")
+        var rd = CsvReader(in_csv)
+        assert_true(String("repr: {}").format(repr(rd)))
+        assert_true(String("len: {}").format(len(rd)))
+        assert_true(String("print: {}").format(rd))
+        assert_true(String("slice: {}").format(rd[0]))
+        assert_true(String("slice repr: {}").format(repr(rd[0])))
+        assert_true("iter:...")
+        for x in rd:
+            assert_true(x)
+    except AssertionError:
+        raise 

tests/mojo_csv/test_pack.mojo

@@ -4,46 +4,33 @@ from testing import assert_true
 
 from mojo_csv import CsvReader
 
-var VALID = List[String](
-    "item1",
-    "item2",
-    '"ite,em3"',
-    '"p""ic"',
-    " pi c",
-    "pic",
-    "r_i_1",
-    '"r_i_2"""',
-    "r_i_3",
-)
-
 
 fn test_pack() raises:
-    var in_csv: Path = cwd().joinpath("tests/test.csv")
-    var rd = CsvReader(in_csv)
-    # print(rd)
-    print("parsing:", in_csv)
-    print("----------")
+    var VALID = List[String](
+        "item1",
+        "item2",
+        '"ite,em3"',
+        '"p""ic"',
+        " pi c",
+        "pic",
+        "r_i_1",
+        '"r_i_2"""',
+        "r_i_3",
+    )
     try:
+        var in_csv: Path = cwd().joinpath("tests/test.csv")
+        var rd = CsvReader(in_csv)
         assert_true(rd.col_count == 3)
         for x in range(len(rd)):
-            print(rd.elements[x])
             assert_true(
                 rd.elements[x] == VALID[x],
                 String("[{0}] != expected [{1}] at index {2}").format(
                     rd.elements[x], VALID[x], x
                 ),
             )
-        print("----------")
-        print("columns:", rd.col_count, "of 3")
-        print("rows:", rd.row_count, "of 3")
         assert_true(rd.row_count == 3)
-        print("elements:", rd.__len__(), "of 9")
         assert_true(len(rd.elements) == 9)
 
-        # for x in rd:
-        # print(x)
     except AssertionError:
-        print(AssertionError)
         raise AssertionError
-    print("----------")
     print("parse successful")