Merge branch 'main' into update-pixi

carolinefrasca · web-flow · commit b5523d629423 · 2025-07-08T16:45:54.000-04:00
diff --git a/.github/workflows/build-pr.yml b/.github/workflows/build-pr.yml
@@ -21,7 +21,7 @@ jobs:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           fetch-depth: 2
-      - uses: prefix-dev/setup-pixi@19eac09b398e3d0c747adc7921926a6d802df4da # v0.8.8
+      - uses: prefix-dev/setup-pixi@14c8aabd75893f83f4ab30c03e7cf853c8208961 # v0.8.10
         with:
           pixi-version: v0.37.0
 
diff --git a/.github/workflows/build-upload.yml b/.github/workflows/build-upload.yml
@@ -25,7 +25,7 @@ jobs:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           fetch-depth: 2
-      - uses: prefix-dev/setup-pixi@19eac09b398e3d0c747adc7921926a6d802df4da # v0.8.8
+      - uses: prefix-dev/setup-pixi@14c8aabd75893f83f4ab30c03e7cf853c8208961 # v0.8.10
         with:
           pixi-version: v0.37.0
 
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-      - uses: prefix-dev/setup-pixi@19eac09b398e3d0c747adc7921926a6d802df4da # v0.8.8
+      - uses: prefix-dev/setup-pixi@14c8aabd75893f83f4ab30c03e7cf853c8208961 # v0.8.10
         with:
           pixi-version: v0.37.0
 
diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml
@@ -16,7 +16,7 @@ jobs:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           fetch-depth: 2
-      - uses: prefix-dev/setup-pixi@19eac09b398e3d0c747adc7921926a6d802df4da # v0.8.8
+      - uses: prefix-dev/setup-pixi@14c8aabd75893f83f4ab30c03e7cf853c8208961 # v0.8.10
         with:
           pixi-version: v0.37.0
 
diff --git a/.github/workflows/remove-incompatible-packages.yml b/.github/workflows/remove-incompatible-packages.yml
@@ -17,7 +17,7 @@ jobs:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           fetch-depth: 2
-      - uses: prefix-dev/setup-pixi@19eac09b398e3d0c747adc7921926a6d802df4da # v0.8.8
+      - uses: prefix-dev/setup-pixi@14c8aabd75893f83f4ab30c03e7cf853c8208961 # v0.8.10
         with:
           pixi-version: v0.37.0
 
diff --git a/.github/workflows/update-lockfiles.yml b/.github/workflows/update-lockfiles.yml
@@ -15,7 +15,7 @@ jobs:
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - name: Set up pixi
-        uses: prefix-dev/setup-pixi@19eac09b398e3d0c747adc7921926a6d802df4da # v0.8.8
+        uses: prefix-dev/setup-pixi@14c8aabd75893f83f4ab30c03e7cf853c8208961 # v0.8.10
         with:
           run-install: false
       - name: Update lockfiles
diff --git a/recipes/mist/recipe.yaml b/recipes/mist/recipe.yaml
@@ -1,21 +1,21 @@
 context:
-  version: "25.3.0"
+  version: "25.4.0"
 
 package:
   name: "mist"
   version: ${{ version }}
 
 source:
   - git: https://github.com/thatstoasty/mist.git
-    rev: 44b33ed6fad24c11a593cecb7a9515b034d73a11
+    rev: 6edf8a17c6f2e0dd7bf194f6dc3d032c0b9d091b
 
 build:
   number: 0
   script:
     - mojo package src/mist -o ${{ PREFIX }}/lib/mojo/mist.mojopkg
 requirements:
   host:
-    - max =25.3
+    - max =25.4
   run:
     - ${{ pin_compatible('max') }}
 
diff --git a/recipes/mojmelo/recipe.yaml b/recipes/mojmelo/recipe.yaml
@@ -1,13 +1,13 @@
 context:
-  version: "0.0.65"
+  version: "0.0.7"
 
 package:
   name: "mojmelo"
   version: ${{ version }}
 
 source:
   - git: https://github.com/yetalit/mojmelo.git
-    rev: 82991dfa4b71b7ed63b468e01be8d5798f4ba61b
+    rev: 4b90055ee3ac18cbdd5d3e6f77600517459688cb
 
 build:
   number: 0
@@ -16,7 +16,7 @@ build:
     - mojo package pixi/mojmelo -o ${{ PREFIX }}/lib/mojo/mojmelo.mojopkg
 requirements:
   host:
-    - max =25.3
+    - max =25.4
   run:
     - ${{ pin_compatible('max') }}
 
@@ -27,7 +27,7 @@ tests:
           - mojo tests/setup.mojo
     requirements:
       run:
-        - max =25.3
+        - max =25.4
     files:
       recipe:
         - tests/setup.mojo
diff --git a/recipes/mojmelo/tests/mojmelo/utils/Matrix.mojo b/recipes/mojmelo/tests/mojmelo/utils/Matrix.mojo
@@ -2,7 +2,7 @@ from .mojmelo_matmul import matmul
 from memory import memcpy, memset_zero, UnsafePointer
 import random
 
-struct Matrix:
+struct Matrix(Copyable, Movable, Sized):
     var height: Int
     var width: Int
     var size: Int
diff --git a/recipes/mojmelo/tests/mojmelo/utils/mojmelo_matmul/matmul.mojo b/recipes/mojmelo/tests/mojmelo/utils/mojmelo_matmul/matmul.mojo
@@ -35,7 +35,7 @@ fn intsqrt[n: Int]() -> Int:
 
 @value
 @register_passable("trivial")
-struct Layout:
+struct Layout(Writable):
     var shape: IndexList[2]
     var strides: IndexList[2]
 
diff --git a/recipes/mojo-regex/README.md b/recipes/mojo-regex/README.md
@@ -0,0 +1,201 @@
+# Mojo Regex
+Regular Expressions Library for Mojo
+
+`mojo-regex` is a regex library featuring a hybrid DFA/NFA engine architecture that automatically optimizes pattern matching based on complexity.
+
+It aims to provide a similar interface as the [re](https://docs.python.org/3/library/re.html) stdlib package while leveraging Mojo's performance capabilities.
+
+## Disclaimer ⚠️
+
+This software is in an early stage of development. Even though it is functional, it is not yet feature-complete and may contain bugs. Check the features section below and the TO-DO sections for the current status
+
+## Implemented Features
+
+### Basic Elements
+- ✅ Literal characters (`a`, `hello`)
+- ✅ Wildcard (`.`) - matches any character except newline
+- ✅ Whitespace (`\s`) - matches space, tab, newline, carriage return, form feed
+- ✅ Escape sequences (`\t` for tab, `\\` for literal backslash)
+
+### Character Classes
+- ✅ Character ranges (`[a-z]`, `[0-9]`, `[A-Za-z0-9]`)
+- ✅ Negated ranges (`[^a-z]`, `[^0-9]`)
+- ✅ Mixed character sets (`[abc123]`)
+- ✅ Character ranges within groups (`(b|[c-n])`)
+
+### Quantifiers
+- ✅ Zero or more (`*`)
+- ✅ One or more (`+`)
+- ✅ Zero or one (`?`)
+- ✅ Exact count (`{3}`)
+- ✅ Range count (`{2,4}`)
+- ✅ Minimum count (`{2,}`)
+- ✅ Quantifiers on all elements (characters, wildcards, ranges, groups)
+
+### Anchors
+- ✅ Start of string (`^`)
+- ✅ End of string (`$`)
+- ✅ Anchors in OR expressions (`^na|nb$`)
+
+### Groups and Alternation
+- ✅ Capturing groups (`(abc)`)
+- ✅ Alternation/OR (`a|b`)
+- ✅ Complex OR patterns (`(a|b)`, `na|nb`)
+- ✅ Nested alternations (`(b|[c-n])`)
+- ✅ Group quantifiers (`(a)*`, `(abc)+`)
+
+### Engine Features
+- ✅ **Hybrid DFA/NFA Architecture** - Automatic engine selection for optimal performance
+- ✅ **O(n) Performance** - DFA engine for simple patterns (literals, basic quantifiers, character classes)
+- ✅ **Full Regex Support** - NFA engine with backtracking for complex patterns
+- ✅ **Pattern Complexity Analysis** - Intelligent routing between engines
+- ✅ **SIMD Optimization** - Vectorized character class matching
+- ✅ **Pattern Compilation Caching** - Pre-compiled patterns for reuse
+- ✅ **Match Position Tracking** - Precise start_idx, end_idx reporting
+- ✅ **Simple API**: `match_first(pattern, text) -> Optional[Match]`
+
+## Installation
+
+1. **Install [pixi](https://pixi.sh/latest/)**
+
+2. **Add the Package** (at the top level of your project):
+
+    ```bash
+    pixi add mojo-regex
+    ```
+
+## Example Usage
+
+```mojo
+from regex import match_first, findall
+
+# Basic literal matching
+var result = match_first("hello", "hello world")
+if result:
+    print("Match found:", result.value().match_text)
+
+# Find all matches
+var matches = findall("a", "banana")
+print("Found", len(matches), "matches:")
+for i in range(len(matches)):
+    print("  Match", i, ":", matches[i].match_text, "at position", matches[i].start_idx)
+
+# Wildcard and quantifiers
+result = match_first(".*@.*", "user@domain.com")
+if result:
+    print("Email found")
+
+# Find all numbers in text
+var numbers = findall("[0-9]+", "Price: $123, Quantity: 456, Total: $579")
+for i in range(len(numbers)):
+    print("Number found:", numbers[i].match_text)
+
+# Character ranges
+result = match_first("[a-z]+", "hello123")
+if result:
+    print("Letters:", result.value().match_text)
+
+# Groups and alternation
+result = match_first("(com|org|net)", "example.com")
+if result:
+    print("TLD found:", result.value().match_text)
+
+# Find all domains in text
+var domains = findall("(com|org|net)", "Visit example.com or test.org for more info")
+for i in range(len(domains)):
+    print("Domain found:", domains[i].match_text)
+
+# Anchors
+result = match_first("^https?://", "https://example.com")
+if result:
+    print("Valid URL")
+
+# Complex patterns
+result = match_first("^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\\.[a-zA-Z]{2,}$", "user@example.com")
+if result:
+    print("Valid email format")
+
+# Find all email addresses in text
+var emails = findall("[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\\.[a-zA-Z]{2,}", "Contact john@example.com or mary@test.org")
+for i in range(len(emails)):
+    print("Email found:", emails[i].match_text)
+```
+
+## Building and Testing
+
+```bash
+# Build the package
+./tools/build.sh
+
+# Run tests
+./tools/run-tests.sh
+
+# Or run specific test
+mojo test -I src/ tests/test_matcher.mojo
+
+# Run benchmarks to see performance including SIMD optimizations
+mojo benchmarks/bench_engine.mojo
+```
+
+## TO-DO: Missing Features
+
+### High Priority
+- [x] Global matching (`findall()`)
+- [x] Hybrid DFA/NFA engine architecture
+- [x] Pattern complexity analysis and optimization
+- [x] SIMD-accelerated character class matching
+- [x] SIMD-accelerated literal string search
+- [x] SIMD capability detection and automatic routing
+- [x] Vectorized quantifier processing for character classes
+- [ ] Non-capturing groups (`(?:...)`)
+- [ ] Named groups (`(?<name>...)` or `(?P<name>...)`)
+- [ ] Predefined character classes (`\d`, `\w`, `\S`, `\D`, `\W`)
+- [ ] Case insensitive matching options
+- [ ] Match replacement (`sub()`, `gsub()`)
+- [ ] String splitting (`split()`)
+
+### Medium Priority
+- [ ] Non-greedy quantifiers (`*?`, `+?`, `??`)
+- [ ] Word boundaries (`\b`, `\B`)
+- [ ] Match groups extraction and iteration
+- [ ] Pattern compilation object
+- [ ] Unicode character classes (`\p{L}`, `\p{N}`)
+- [ ] Multiline mode (`^` and `$` match line boundaries)
+- [ ] Dot-all mode (`.` matches newlines)
+
+### Advanced Features
+- [ ] Positive lookahead (`(?=...)`)
+- [ ] Negative lookahead (`(?!...)`)
+- [ ] Positive lookbehind (`(?<=...)`)
+- [ ] Negative lookbehind (`(?<!...)`)
+- [ ] Backreferences (`\1`, `\2`)
+- [ ] Atomic groups (`(?>...)`)
+- [ ] Possessive quantifiers (`*+`, `++`)
+- [ ] Conditional expressions (`(?(condition)yes|no)`)
+- [ ] Recursive patterns
+- [ ] Subroutine calls
+
+### Engine Improvements
+- [x] Hybrid DFA/NFA architecture with automatic engine selection
+- [x] O(n) DFA engine for simple patterns
+- [x] SIMD optimization for character class matching and literal string search
+- [x] Pattern complexity analysis for optimal routing
+- [x] SIMD capability detection for intelligent engine selection
+- [x] Vectorized operations for quantifiers and repetition counting
+- [ ] Additional DFA pattern support (more complex quantifiers and groups)
+- [ ] Compile-time pattern specialization for string literals
+- [ ] Aho-Corasick multi-pattern matching for alternations
+- [ ] Advanced NFA optimizations (lazy quantifiers, cut operators)
+- [ ] Parallel matching for multiple patterns
+
+## Contributing
+
+Contributions are welcome! If you'd like to contribute, please follow the contribution guidelines in the [CONTRIBUTING.md](CONTRIBUTING.md) file in the repository.
+
+## Acknowledgments
+
+Thanks to Claude Code for helping a lot with the implementation and testing of the mojo-regex library, and to the Mojo community for their support and feedback.
+
+## License
+
+mojo is licensed under the [MIT license](LICENSE).
diff --git a/recipes/mojo-regex/image.jpeg b/recipes/mojo-regex/image.jpeg
diff --git a/recipes/mojo-regex/recipe.yaml b/recipes/mojo-regex/recipe.yaml
@@ -0,0 +1,29 @@
+about:
+  description: "# Mojo Regex\nRegular Expressions Library for Mojo\n\n`mojo-regex` is a\
+    \ regex library featuring a hybrid DFA/NFA engine architecture that automatically\
+    \ optimizes pattern matching based on complexity.\n\nIt aims to provide a similar\
+    \ interface as the [re](https://docs.python.org/3/library/re.html) stdlib package\
+    \ while leveraging Mojo's performance capabilities."
+  homepage: https://github.com/msaelices/mojo-regex
+  license: MIT
+  license_file: LICENSE
+  repository: https://github.com/msaelices/mojo-regex
+  summary: Library for dealing with regular expressions in Mojo
+build:
+  number: 0
+  script:
+  - mkdir -p ${PREFIX}/lib/mojo
+  - mojo package src/regex -o ${PREFIX}/lib/mojo/mojo-regex.mojopkg
+context:
+  version: 13.4.2
+package:
+  name: mojo-regex
+  version: 0.2.1
+requirements:
+  host:
+    - max =25.4.0
+  run:
+    - ${{ pin_compatible('max') }}
+source:
+  - git: https://github.com/msaelices/mojo-regex.git
+    rev: cc187a5987143b0eb7d9497e6ddb7546f2296e9c
diff --git a/recipes/mojo_csv/README.md b/recipes/mojo_csv/README.md
diff --git a/recipes/mojo_csv/recipe.yaml b/recipes/mojo_csv/recipe.yaml
diff --git a/recipes/small_time/recipe.yaml b/recipes/small_time/recipe.yaml
