Merge pull request #344 from bnema/chore/upstream-foundations
chore(deps): integrate approved upstream foundations
921 files · +28709 -25527
M docs/first-presentation.md +5 -2
| @@ -46,5 +46,8 @@ labels. Set `DUMBER_MACHINE_GPU_PROFILE` to one of `generic-gpu`, | |||
| 46 | 46 | `integrated-gpu`, `discrete-gpu`, `hybrid-gpu`, `virtual-gpu`, or `unknown-gpu`; | |
| 47 | 47 | do not use a device model or other identifier. Publish only the seven reviewed | |
| 48 | 48 | JSON files to an external Gist. Raw logs and temporary XDG homes are removed and | |
| 49 | - | must not be published. A missing or incomplete timeline, non-DMABUF backend, or | |
| 50 | - | invalid run fails collection. | |
| 49 | + | must not be published. `metadata.json` derives the selected | |
| 50 | + | `github.com/bnema/purego-cef2gtk` pseudo-version and its full immutable Git | |
| 51 | + | origin hash from Go module metadata; branch selectors or missing origin metadata | |
| 52 | + | fail collection. A missing or incomplete timeline, non-DMABUF backend, or invalid | |
| 53 | + | run also fails collection. | |
| @@ -46,5 +46,8 @@ labels. Set `DUMBER_MACHINE_GPU_PROFILE` to one of `generic-gpu`, | |||||
| 46 | `integrated-gpu`, `discrete-gpu`, `hybrid-gpu`, `virtual-gpu`, or `unknown-gpu`; | 46 | `integrated-gpu`, `discrete-gpu`, `hybrid-gpu`, `virtual-gpu`, or `unknown-gpu`; | ||
| 47 | do not use a device model or other identifier. Publish only the seven reviewed | 47 | do not use a device model or other identifier. Publish only the seven reviewed | ||
| 48 | JSON files to an external Gist. Raw logs and temporary XDG homes are removed and | 48 | JSON files to an external Gist. Raw logs and temporary XDG homes are removed and | ||
| 49 | - | must not be published. A missing or incomplete timeline, non-DMABUF backend, or | 49 | + | must not be published. `metadata.json` derives the selected |
| 50 | - | invalid run fails collection. | 50 | + | `github.com/bnema/purego-cef2gtk` pseudo-version and its full immutable Git |
| 51 | + | origin hash from Go module metadata; branch selectors or missing origin metadata | |||
| 52 | + | fail collection. A missing or incomplete timeline, non-DMABUF backend, or invalid | |||
| 53 | + | run also fails collection. | |||
M go.mod +5 -5
| @@ -6,11 +6,11 @@ require ( | |||
| 6 | 6 | github.com/a-h/templ v0.3.1020 | |
| 7 | 7 | github.com/andybalholm/brotli v1.2.2 | |
| 8 | 8 | github.com/bnema/purego v0.11.0-bnema.4 | |
| 9 | - | github.com/bnema/purego-cef v0.13.3 | |
| 10 | - | github.com/bnema/purego-cef2gtk v0.8.4 | |
| 11 | - | github.com/bnema/purego-pipewire v0.1.4 | |
| 12 | - | github.com/bnema/purego-sqlite v0.1.3 | |
| 13 | - | github.com/bnema/puregotk v0.7.0 | |
| 9 | + | github.com/bnema/purego-cef v0.13.4-0.20260714140305-f0b7414af67e | |
| 10 | + | github.com/bnema/purego-cef2gtk v0.8.4-0.20260714160309-bbd397409ebe | |
| 11 | + | github.com/bnema/purego-pipewire v0.1.5-0.20260714124450-6504b9cdf02a | |
| 12 | + | github.com/bnema/purego-sqlite v0.1.4-0.20260714131321-3614fe683b9c | |
| 13 | + | github.com/bnema/puregotk v0.7.1-0.20260714170452-0b6b9b901234 | |
| 14 | 14 | github.com/charmbracelet/bubbles v1.0.0 | |
| 15 | 15 | github.com/charmbracelet/bubbletea v1.3.10 | |
| 16 | 16 | github.com/charmbracelet/lipgloss v1.1.0 | |
| @@ -6,11 +6,11 @@ require ( | |||||
| 6 | github.com/a-h/templ v0.3.1020 | 6 | github.com/a-h/templ v0.3.1020 | ||
| 7 | github.com/andybalholm/brotli v1.2.2 | 7 | github.com/andybalholm/brotli v1.2.2 | ||
| 8 | github.com/bnema/purego v0.11.0-bnema.4 | 8 | github.com/bnema/purego v0.11.0-bnema.4 | ||
| 9 | - | github.com/bnema/purego-cef v0.13.3 | 9 | + | github.com/bnema/purego-cef v0.13.4-0.20260714140305-f0b7414af67e |
| 10 | - | github.com/bnema/purego-cef2gtk v0.8.4 | 10 | + | github.com/bnema/purego-cef2gtk v0.8.4-0.20260714160309-bbd397409ebe |
| 11 | - | github.com/bnema/purego-pipewire v0.1.4 | 11 | + | github.com/bnema/purego-pipewire v0.1.5-0.20260714124450-6504b9cdf02a |
| 12 | - | github.com/bnema/purego-sqlite v0.1.3 | 12 | + | github.com/bnema/purego-sqlite v0.1.4-0.20260714131321-3614fe683b9c |
| 13 | - | github.com/bnema/puregotk v0.7.0 | 13 | + | github.com/bnema/puregotk v0.7.1-0.20260714170452-0b6b9b901234 |
| 14 | github.com/charmbracelet/bubbles v1.0.0 | 14 | github.com/charmbracelet/bubbles v1.0.0 | ||
| 15 | github.com/charmbracelet/bubbletea v1.3.10 | 15 | github.com/charmbracelet/bubbletea v1.3.10 | ||
| 16 | github.com/charmbracelet/lipgloss v1.1.0 | 16 | github.com/charmbracelet/lipgloss v1.1.0 | ||
M go.sum +12 -0 generated file: collapsed
A internal/infrastructure/persistence/sqlite/history_repo_benchmark_test.go +71 -0
| @@ -0,0 +1,71 @@ | |||
| 1 | + | package sqlite_test | |
| 2 | + | ||
| 3 | + | import ( | |
| 4 | + | "fmt" | |
| 5 | + | "path/filepath" | |
| 6 | + | "testing" | |
| 7 | + | ||
| 8 | + | "github.com/bnema/dumber/internal/domain/entity" | |
| 9 | + | "github.com/bnema/dumber/internal/domain/repository" | |
| 10 | + | "github.com/bnema/dumber/internal/infrastructure/persistence/sqlite" | |
| 11 | + | ) | |
| 12 | + | ||
| 13 | + | // newHistoryBenchmarkRepository creates a representative local history corpus | |
| 14 | + | // outside the measured operation. Sidebar reads use GetRecent and omnibox | |
| 15 | + | // history suggestions use Search. | |
| 16 | + | func newHistoryBenchmarkRepository(b *testing.B) (repository.HistoryRepository, func()) { | |
| 17 | + | b.Helper() | |
| 18 | + | ||
| 19 | + | ctx := historyTestCtx() | |
| 20 | + | db, err := sqlite.NewConnection(ctx, filepath.Join(b.TempDir(), "dumber.db")) | |
| 21 | + | if err != nil { | |
| 22 | + | b.Fatal(err) | |
| 23 | + | } | |
| 24 | + | ||
| 25 | + | b.Cleanup(func() { | |
| 26 | + | if err := db.Close(); err != nil { | |
| 27 | + | b.Errorf("close benchmark database: %v", err) | |
| 28 | + | } | |
| 29 | + | }) | |
| 30 | + | ||
| 31 | + | repo := sqlite.NewHistoryRepository(db) | |
| 32 | + | for i := range 200 { | |
| 33 | + | entry := &entity.HistoryEntry{ | |
| 34 | + | URL: fmt.Sprintf("https://example%d.test/dumber/history/%d", i%20, i), | |
| 35 | + | Title: fmt.Sprintf("Dumber history entry %d", i), | |
| 36 | + | } | |
| 37 | + | if err := repo.Save(ctx, entry); err != nil { | |
| 38 | + | b.Fatal(err) | |
| 39 | + | } | |
| 40 | + | } | |
| 41 | + | ||
| 42 | + | return repo, func() {} | |
| 43 | + | } | |
| 44 | + | ||
| 45 | + | func BenchmarkHistorySQLiteSidebarRecent(b *testing.B) { | |
| 46 | + | repo, closeDB := newHistoryBenchmarkRepository(b) | |
| 47 | + | defer closeDB() | |
| 48 | + | ctx := historyTestCtx() | |
| 49 | + | ||
| 50 | + | b.ReportAllocs() | |
| 51 | + | b.ResetTimer() | |
| 52 | + | for range b.N { | |
| 53 | + | if _, err := repo.GetRecent(ctx, 50, 0); err != nil { | |
| 54 | + | b.Fatal(err) | |
| 55 | + | } | |
| 56 | + | } | |
| 57 | + | } | |
| 58 | + | ||
| 59 | + | func BenchmarkHistorySQLiteOmniboxSearch(b *testing.B) { | |
| 60 | + | repo, closeDB := newHistoryBenchmarkRepository(b) | |
| 61 | + | defer closeDB() | |
| 62 | + | ctx := historyTestCtx() | |
| 63 | + | ||
| 64 | + | b.ReportAllocs() | |
| 65 | + | b.ResetTimer() | |
| 66 | + | for range b.N { | |
| 67 | + | if _, err := repo.Search(ctx, "dumber history", 10); err != nil { | |
| 68 | + | b.Fatal(err) | |
| 69 | + | } | |
| 70 | + | } | |
| 71 | + | } | |
| @@ -0,0 +1,71 @@ | |||||
| 1 | + | package sqlite_test | |||
| 2 | + | ||||
| 3 | + | import ( | |||
| 4 | + | "fmt" | |||
| 5 | + | "path/filepath" | |||
| 6 | + | "testing" | |||
| 7 | + | ||||
| 8 | + | "github.com/bnema/dumber/internal/domain/entity" | |||
| 9 | + | "github.com/bnema/dumber/internal/domain/repository" | |||
| 10 | + | "github.com/bnema/dumber/internal/infrastructure/persistence/sqlite" | |||
| 11 | + | ) | |||
| 12 | + | ||||
| 13 | + | // newHistoryBenchmarkRepository creates a representative local history corpus | |||
| 14 | + | // outside the measured operation. Sidebar reads use GetRecent and omnibox | |||
| 15 | + | // history suggestions use Search. | |||
| 16 | + | func newHistoryBenchmarkRepository(b *testing.B) (repository.HistoryRepository, func()) { | |||
| 17 | + | b.Helper() | |||
| 18 | + | ||||
| 19 | + | ctx := historyTestCtx() | |||
| 20 | + | db, err := sqlite.NewConnection(ctx, filepath.Join(b.TempDir(), "dumber.db")) | |||
| 21 | + | if err != nil { | |||
| 22 | + | b.Fatal(err) | |||
| 23 | + | } | |||
| 24 | + | ||||
| 25 | + | b.Cleanup(func() { | |||
| 26 | + | if err := db.Close(); err != nil { | |||
| 27 | + | b.Errorf("close benchmark database: %v", err) | |||
| 28 | + | } | |||
| 29 | + | }) | |||
| 30 | + | ||||
| 31 | + | repo := sqlite.NewHistoryRepository(db) | |||
| 32 | + | for i := range 200 { | |||
| 33 | + | entry := &entity.HistoryEntry{ | |||
| 34 | + | URL: fmt.Sprintf("https://example%d.test/dumber/history/%d", i%20, i), | |||
| 35 | + | Title: fmt.Sprintf("Dumber history entry %d", i), | |||
| 36 | + | } | |||
| 37 | + | if err := repo.Save(ctx, entry); err != nil { | |||
| 38 | + | b.Fatal(err) | |||
| 39 | + | } | |||
| 40 | + | } | |||
| 41 | + | ||||
| 42 | + | return repo, func() {} | |||
| 43 | + | } | |||
| 44 | + | ||||
| 45 | + | func BenchmarkHistorySQLiteSidebarRecent(b *testing.B) { | |||
| 46 | + | repo, closeDB := newHistoryBenchmarkRepository(b) | |||
| 47 | + | defer closeDB() | |||
| 48 | + | ctx := historyTestCtx() | |||
| 49 | + | ||||
| 50 | + | b.ReportAllocs() | |||
| 51 | + | b.ResetTimer() | |||
| 52 | + | for range b.N { | |||
| 53 | + | if _, err := repo.GetRecent(ctx, 50, 0); err != nil { | |||
| 54 | + | b.Fatal(err) | |||
| 55 | + | } | |||
| 56 | + | } | |||
| 57 | + | } | |||
| 58 | + | ||||
| 59 | + | func BenchmarkHistorySQLiteOmniboxSearch(b *testing.B) { | |||
| 60 | + | repo, closeDB := newHistoryBenchmarkRepository(b) | |||
| 61 | + | defer closeDB() | |||
| 62 | + | ctx := historyTestCtx() | |||
| 63 | + | ||||
| 64 | + | b.ReportAllocs() | |||
| 65 | + | b.ResetTimer() | |||
| 66 | + | for range b.N { | |||
| 67 | + | if _, err := repo.Search(ctx, "dumber history", 10); err != nil { | |||
| 68 | + | b.Fatal(err) | |||
| 69 | + | } | |||
| 70 | + | } | |||
| 71 | + | } | |||
M internal/logging/first_presentation_collector_test.go +132 -1
| @@ -2,6 +2,7 @@ package logging | |||
| 2 | 2 | ||
| 3 | 3 | import ( | |
| 4 | 4 | "encoding/json" | |
| 5 | + | "fmt" | |
| 5 | 6 | "os" | |
| 6 | 7 | "os/exec" | |
| 7 | 8 | "path/filepath" | |
| @@ -143,8 +144,9 @@ func TestFirstPresentationCollectorSanitizesMachineLocalValues(t *testing.T) { | |||
| 143 | 144 | } | |
| 144 | 145 | for _, required := range []string{ | |
| 145 | 146 | `"measured_source_revision"`, | |
| 147 | + | `"version": "v0.8.4-0.20260714160309-bbd397409ebe"`, | |
| 146 | 148 | `"tag": "v0.8.4"`, | |
| 147 | - | `"revision": "f217ece342dea3ef2a3f98671fcd16a39ad0037d"`, | |
| 149 | + | `"revision": "bbd397409ebed75a5979c1e4566a2ef319f6a484"`, | |
| 148 | 150 | } { | |
| 149 | 151 | require.Contains(t, artifacts.String(), required) | |
| 150 | 152 | } | |
| @@ -166,6 +168,135 @@ func TestFirstPresentationCollectorSanitizesMachineLocalValues(t *testing.T) { | |||
| 166 | 168 | require.Equal(t, "integrated-gpu", metadata.Comparison.MachineGPUProfile) | |
| 167 | 169 | } | |
| 168 | 170 | ||
| 171 | + | func TestFirstPresentationCollectorDerivesSelectedImmutableModuleProvenance(t *testing.T) { | |
| 172 | + | repoRoot, err := filepath.Abs(filepath.Join("..", "..")) | |
| 173 | + | require.NoError(t, err) | |
| 174 | + | temp := t.TempDir() | |
| 175 | + | runtime := filepath.Join(temp, "cef-147-runtime") | |
| 176 | + | require.NoError(t, os.Mkdir(runtime, 0o755)) | |
| 177 | + | binary := filepath.Join(temp, "dumber") | |
| 178 | + | require.NoError(t, os.WriteFile(binary, collectorTestBinary(validFirstPresentationLog), 0o755)) | |
| 179 | + | ||
| 180 | + | // This exact pseudo-version is deliberately newer than the former v0.8.4 | |
| 181 | + | // hardcode; the collector must report what the selected module says. | |
| 182 | + | const version = "v0.8.5-0.20300102030405-bbd397409ebe" | |
| 183 | + | const revision = "bbd397409ebed75a5979c1e4566a2ef319f6a484" | |
| 184 | + | goBin := collectorProvenanceGo(t, temp, version, revision, "") | |
| 185 | + | output := filepath.Join(temp, "artifacts") | |
| 186 | + | cmd := exec.Command(filepath.Join(repoRoot, "scripts", "collect_first_presentation.sh")) | |
| 187 | + | cmd.Dir = repoRoot | |
| 188 | + | cmd.Env = append(os.Environ(), | |
| 189 | + | "DISPLAY=:test", | |
| 190 | + | "DUMBER_CEF_DIR="+runtime, | |
| 191 | + | "DUMBER_FIRST_PRESENTATION_BIN="+binary, | |
| 192 | + | "DUMBER_FIRST_PRESENTATION_OUTPUT="+output, | |
| 193 | + | "DUMBER_FIRST_PRESENTATION_TIMEOUT_SECONDS=1", | |
| 194 | + | "PATH="+filepath.Dir(goBin)+":"+os.Getenv("PATH"), | |
| 195 | + | ) | |
| 196 | + | result, err := cmd.CombinedOutput() | |
| 197 | + | require.NoErrorf(t, err, "collector failed: %s", result) | |
| 198 | + | ||
| 199 | + | var metadata struct { | |
| 200 | + | Upstream struct { | |
| 201 | + | Module string `json:"module"` | |
| 202 | + | Version string `json:"version"` | |
| 203 | + | Tag string `json:"tag"` | |
| 204 | + | Revision string `json:"revision"` | |
| 205 | + | } `json:"upstream"` | |
| 206 | + | } | |
| 207 | + | contents, err := os.ReadFile(filepath.Join(output, "metadata.json")) | |
| 208 | + | require.NoError(t, err) | |
| 209 | + | require.NoError(t, json.Unmarshal(contents, &metadata)) | |
| 210 | + | require.Equal(t, "github.com/bnema/purego-cef2gtk", metadata.Upstream.Module) | |
| 211 | + | require.Equal(t, version, metadata.Upstream.Version) | |
| 212 | + | require.Equal(t, "v0.8.5", metadata.Upstream.Tag) | |
| 213 | + | require.Equal(t, revision, metadata.Upstream.Revision) | |
| 214 | + | ||
| 215 | + | script, err := os.ReadFile(filepath.Join(repoRoot, "scripts", "collect_first_presentation.sh")) | |
| 216 | + | require.NoError(t, err) | |
| 217 | + | require.NotContains(t, string(script), "f217ece342dea3ef2a3f98671fcd16a39ad0037d") | |
| 218 | + | } | |
| 219 | + | ||
| 220 | + | func TestFirstPresentationCollectorRejectsNonImmutableModuleProvenanceWithoutLeaks(t *testing.T) { | |
| 221 | + | repoRoot, err := filepath.Abs(filepath.Join("..", "..")) | |
| 222 | + | require.NoError(t, err) | |
| 223 | + | ||
| 224 | + | for _, test := range []struct { | |
| 225 | + | name, version, revision, ref string | |
| 226 | + | }{ | |
| 227 | + | {name: "branch selector", version: "main", ref: "main"}, | |
| 228 | + | {name: "missing origin", version: "v0.8.5-0.20300102030405-bbd397409ebe"}, | |
| 229 | + | {name: "named origin ref", version: "v0.8.5-0.20300102030405-bbd397409ebe", revision: "bbd397409ebed75a5979c1e4566a2ef319f6a484", ref: "main"}, | |
| 230 | + | } { | |
| 231 | + | t.Run(test.name, func(t *testing.T) { | |
| 232 | + | temp := t.TempDir() | |
| 233 | + | runtime := filepath.Join(temp, "cef-147-runtime") | |
| 234 | + | require.NoError(t, os.Mkdir(runtime, 0o755)) | |
| 235 | + | binary := filepath.Join(temp, "dumber") | |
| 236 | + | require.NoError(t, os.WriteFile(binary, collectorTestBinary(validFirstPresentationLog), 0o755)) | |
| 237 | + | ||
| 238 | + | goBin := collectorProvenanceGo(t, temp, test.version, test.revision, test.ref) | |
| 239 | + | output := filepath.Join(temp, "artifacts") | |
| 240 | + | cmd := exec.Command(filepath.Join(repoRoot, "scripts", "collect_first_presentation.sh")) | |
| 241 | + | cmd.Dir = repoRoot | |
| 242 | + | cmd.Env = append(os.Environ(), | |
| 243 | + | "DISPLAY=:test", | |
| 244 | + | "DUMBER_CEF_DIR="+runtime, | |
| 245 | + | "DUMBER_FIRST_PRESENTATION_BIN="+binary, | |
| 246 | + | "DUMBER_FIRST_PRESENTATION_OUTPUT="+output, | |
| 247 | + | "PATH="+filepath.Dir(goBin)+":"+os.Getenv("PATH"), | |
| 248 | + | ) | |
| 249 | + | result, runErr := cmd.CombinedOutput() | |
| 250 | + | require.Errorf(t, runErr, "collector accepted nonimmutable module provenance: %s", result) | |
| 251 | + | require.Contains(t, string(result), "immutable module provenance is unavailable") | |
| 252 | + | require.NotContains(t, string(result), temp) | |
| 253 | + | require.NoFileExists(t, filepath.Join(output, "metadata.json")) | |
| 254 | + | for _, name := range runArtifactNames() { | |
| 255 | + | require.NoFileExists(t, filepath.Join(output, name)) | |
| 256 | + | } | |
| 257 | + | }) | |
| 258 | + | } | |
| 259 | + | } | |
| 260 | + | ||
| 261 | + | func collectorProvenanceGo(t *testing.T, temp, version, revision, ref string) string { | |
| 262 | + | t.Helper() | |
| 263 | + | infoPath := filepath.Join(temp, "module.info") | |
| 264 | + | info := map[string]any{"Version": version} | |
| 265 | + | if revision != "" { | |
| 266 | + | info["Origin"] = map[string]string{ | |
| 267 | + | "VCS": "git", "URL": "https://github.com/bnema/purego-cef2gtk", "Hash": revision, "Ref": ref, | |
| 268 | + | } | |
| 269 | + | } | |
| 270 | + | infoJSON, err := json.Marshal(info) | |
| 271 | + | require.NoError(t, err) | |
| 272 | + | require.NoError(t, os.WriteFile(infoPath, infoJSON, 0o600)) | |
| 273 | + | ||
| 274 | + | selectedJSON, err := json.Marshal(map[string]string{ | |
| 275 | + | "Path": "github.com/bnema/purego-cef2gtk", "Version": version, | |
| 276 | + | }) | |
| 277 | + | require.NoError(t, err) | |
| 278 | + | downloadedJSON, err := json.Marshal(map[string]string{ | |
| 279 | + | "Path": "github.com/bnema/purego-cef2gtk", "Version": version, "Info": infoPath, | |
| 280 | + | }) | |
| 281 | + | require.NoError(t, err) | |
| 282 | + | binDir := filepath.Join(temp, "bin") | |
| 283 | + | require.NoError(t, os.Mkdir(binDir, 0o755)) | |
| 284 | + | goBin := filepath.Join(binDir, "go") | |
| 285 | + | script := fmt.Sprintf(`#!/bin/sh | |
| 286 | + | if [ "$1" = "list" ] && [ "$2" = "-m" ] && [ "$3" = "-json" ] && [ "$4" = "github.com/bnema/purego-cef2gtk" ]; then | |
| 287 | + | printf '%%s\n' '%s' | |
| 288 | + | exit 0 | |
| 289 | + | fi | |
| 290 | + | if [ "$1" = "mod" ] && [ "$2" = "download" ] && [ "$3" = "-json" ] && [ "$4" = "github.com/bnema/purego-cef2gtk@%s" ]; then | |
| 291 | + | printf '%%s\n' '%s' | |
| 292 | + | exit 0 | |
| 293 | + | fi | |
| 294 | + | exit 1 | |
| 295 | + | `, selectedJSON, version, downloadedJSON) | |
| 296 | + | require.NoError(t, os.WriteFile(goBin, []byte(script), 0o755)) | |
| 297 | + | return goBin | |
| 298 | + | } | |
| 299 | + | ||
| 169 | 300 | func TestFirstPresentationCollectorDefaultsToXDGStateEvidenceDirectory(t *testing.T) { | |
| 170 | 301 | repoRoot, err := filepath.Abs(filepath.Join("..", "..")) | |
| 171 | 302 | require.NoError(t, err) | |
| @@ -2,6 +2,7 @@ package logging | |||||
| 2 | 2 | ||||
| 3 | import ( | 3 | import ( | ||
| 4 | "encoding/json" | 4 | "encoding/json" | ||
| 5 | + | "fmt" | |||
| 5 | "os" | 6 | "os" | ||
| 6 | "os/exec" | 7 | "os/exec" | ||
| 7 | "path/filepath" | 8 | "path/filepath" | ||
| @@ -143,8 +144,9 @@ func TestFirstPresentationCollectorSanitizesMachineLocalValues(t *testing.T) { | |||||
| 143 | } | 144 | } | ||
| 144 | for _, required := range []string{ | 145 | for _, required := range []string{ | ||
| 145 | `"measured_source_revision"`, | 146 | `"measured_source_revision"`, | ||
| 147 | + | `"version": "v0.8.4-0.20260714160309-bbd397409ebe"`, | |||
| 146 | `"tag": "v0.8.4"`, | 148 | `"tag": "v0.8.4"`, | ||
| 147 | - | `"revision": "f217ece342dea3ef2a3f98671fcd16a39ad0037d"`, | 149 | + | `"revision": "bbd397409ebed75a5979c1e4566a2ef319f6a484"`, |
| 148 | } { | 150 | } { | ||
| 149 | require.Contains(t, artifacts.String(), required) | 151 | require.Contains(t, artifacts.String(), required) | ||
| 150 | } | 152 | } | ||
| @@ -166,6 +168,135 @@ func TestFirstPresentationCollectorSanitizesMachineLocalValues(t *testing.T) { | |||||
| 166 | require.Equal(t, "integrated-gpu", metadata.Comparison.MachineGPUProfile) | 168 | require.Equal(t, "integrated-gpu", metadata.Comparison.MachineGPUProfile) | ||
| 167 | } | 169 | } | ||
| 168 | 170 | ||||
| 171 | + | func TestFirstPresentationCollectorDerivesSelectedImmutableModuleProvenance(t *testing.T) { | |||
| 172 | + | repoRoot, err := filepath.Abs(filepath.Join("..", "..")) | |||
| 173 | + | require.NoError(t, err) | |||
| 174 | + | temp := t.TempDir() | |||
| 175 | + | runtime := filepath.Join(temp, "cef-147-runtime") | |||
| 176 | + | require.NoError(t, os.Mkdir(runtime, 0o755)) | |||
| 177 | + | binary := filepath.Join(temp, "dumber") | |||
| 178 | + | require.NoError(t, os.WriteFile(binary, collectorTestBinary(validFirstPresentationLog), 0o755)) | |||
| 179 | + | ||||
| 180 | + | // This exact pseudo-version is deliberately newer than the former v0.8.4 | |||
| 181 | + | // hardcode; the collector must report what the selected module says. | |||
| 182 | + | const version = "v0.8.5-0.20300102030405-bbd397409ebe" | |||
| 183 | + | const revision = "bbd397409ebed75a5979c1e4566a2ef319f6a484" | |||
| 184 | + | goBin := collectorProvenanceGo(t, temp, version, revision, "") | |||
| 185 | + | output := filepath.Join(temp, "artifacts") | |||
| 186 | + | cmd := exec.Command(filepath.Join(repoRoot, "scripts", "collect_first_presentation.sh")) | |||
| 187 | + | cmd.Dir = repoRoot | |||
| 188 | + | cmd.Env = append(os.Environ(), | |||
| 189 | + | "DISPLAY=:test", | |||
| 190 | + | "DUMBER_CEF_DIR="+runtime, | |||
| 191 | + | "DUMBER_FIRST_PRESENTATION_BIN="+binary, | |||
| 192 | + | "DUMBER_FIRST_PRESENTATION_OUTPUT="+output, | |||
| 193 | + | "DUMBER_FIRST_PRESENTATION_TIMEOUT_SECONDS=1", | |||
| 194 | + | "PATH="+filepath.Dir(goBin)+":"+os.Getenv("PATH"), | |||
| 195 | + | ) | |||
| 196 | + | result, err := cmd.CombinedOutput() | |||
| 197 | + | require.NoErrorf(t, err, "collector failed: %s", result) | |||
| 198 | + | ||||
| 199 | + | var metadata struct { | |||
| 200 | + | Upstream struct { | |||
| 201 | + | Module string `json:"module"` | |||
| 202 | + | Version string `json:"version"` | |||
| 203 | + | Tag string `json:"tag"` | |||
| 204 | + | Revision string `json:"revision"` | |||
| 205 | + | } `json:"upstream"` | |||
| 206 | + | } | |||
| 207 | + | contents, err := os.ReadFile(filepath.Join(output, "metadata.json")) | |||
| 208 | + | require.NoError(t, err) | |||
| 209 | + | require.NoError(t, json.Unmarshal(contents, &metadata)) | |||
| 210 | + | require.Equal(t, "github.com/bnema/purego-cef2gtk", metadata.Upstream.Module) | |||
| 211 | + | require.Equal(t, version, metadata.Upstream.Version) | |||
| 212 | + | require.Equal(t, "v0.8.5", metadata.Upstream.Tag) | |||
| 213 | + | require.Equal(t, revision, metadata.Upstream.Revision) | |||
| 214 | + | ||||
| 215 | + | script, err := os.ReadFile(filepath.Join(repoRoot, "scripts", "collect_first_presentation.sh")) | |||
| 216 | + | require.NoError(t, err) | |||
| 217 | + | require.NotContains(t, string(script), "f217ece342dea3ef2a3f98671fcd16a39ad0037d") | |||
| 218 | + | } | |||
| 219 | + | ||||
| 220 | + | func TestFirstPresentationCollectorRejectsNonImmutableModuleProvenanceWithoutLeaks(t *testing.T) { | |||
| 221 | + | repoRoot, err := filepath.Abs(filepath.Join("..", "..")) | |||
| 222 | + | require.NoError(t, err) | |||
| 223 | + | ||||
| 224 | + | for _, test := range []struct { | |||
| 225 | + | name, version, revision, ref string | |||
| 226 | + | }{ | |||
| 227 | + | {name: "branch selector", version: "main", ref: "main"}, | |||
| 228 | + | {name: "missing origin", version: "v0.8.5-0.20300102030405-bbd397409ebe"}, | |||
| 229 | + | {name: "named origin ref", version: "v0.8.5-0.20300102030405-bbd397409ebe", revision: "bbd397409ebed75a5979c1e4566a2ef319f6a484", ref: "main"}, | |||
| 230 | + | } { | |||
| 231 | + | t.Run(test.name, func(t *testing.T) { | |||
| 232 | + | temp := t.TempDir() | |||
| 233 | + | runtime := filepath.Join(temp, "cef-147-runtime") | |||
| 234 | + | require.NoError(t, os.Mkdir(runtime, 0o755)) | |||
| 235 | + | binary := filepath.Join(temp, "dumber") | |||
| 236 | + | require.NoError(t, os.WriteFile(binary, collectorTestBinary(validFirstPresentationLog), 0o755)) | |||
| 237 | + | ||||
| 238 | + | goBin := collectorProvenanceGo(t, temp, test.version, test.revision, test.ref) | |||
| 239 | + | output := filepath.Join(temp, "artifacts") | |||
| 240 | + | cmd := exec.Command(filepath.Join(repoRoot, "scripts", "collect_first_presentation.sh")) | |||
| 241 | + | cmd.Dir = repoRoot | |||
| 242 | + | cmd.Env = append(os.Environ(), | |||
| 243 | + | "DISPLAY=:test", | |||
| 244 | + | "DUMBER_CEF_DIR="+runtime, | |||
| 245 | + | "DUMBER_FIRST_PRESENTATION_BIN="+binary, | |||
| 246 | + | "DUMBER_FIRST_PRESENTATION_OUTPUT="+output, | |||
| 247 | + | "PATH="+filepath.Dir(goBin)+":"+os.Getenv("PATH"), | |||
| 248 | + | ) | |||
| 249 | + | result, runErr := cmd.CombinedOutput() | |||
| 250 | + | require.Errorf(t, runErr, "collector accepted nonimmutable module provenance: %s", result) | |||
| 251 | + | require.Contains(t, string(result), "immutable module provenance is unavailable") | |||
| 252 | + | require.NotContains(t, string(result), temp) | |||
| 253 | + | require.NoFileExists(t, filepath.Join(output, "metadata.json")) | |||
| 254 | + | for _, name := range runArtifactNames() { | |||
| 255 | + | require.NoFileExists(t, filepath.Join(output, name)) | |||
| 256 | + | } | |||
| 257 | + | }) | |||
| 258 | + | } | |||
| 259 | + | } | |||
| 260 | + | ||||
| 261 | + | func collectorProvenanceGo(t *testing.T, temp, version, revision, ref string) string { | |||
| 262 | + | t.Helper() | |||
| 263 | + | infoPath := filepath.Join(temp, "module.info") | |||
| 264 | + | info := map[string]any{"Version": version} | |||
| 265 | + | if revision != "" { | |||
| 266 | + | info["Origin"] = map[string]string{ | |||
| 267 | + | "VCS": "git", "URL": "https://github.com/bnema/purego-cef2gtk", "Hash": revision, "Ref": ref, | |||
| 268 | + | } | |||
| 269 | + | } | |||
| 270 | + | infoJSON, err := json.Marshal(info) | |||
| 271 | + | require.NoError(t, err) | |||
| 272 | + | require.NoError(t, os.WriteFile(infoPath, infoJSON, 0o600)) | |||
| 273 | + | ||||
| 274 | + | selectedJSON, err := json.Marshal(map[string]string{ | |||
| 275 | + | "Path": "github.com/bnema/purego-cef2gtk", "Version": version, | |||
| 276 | + | }) | |||
| 277 | + | require.NoError(t, err) | |||
| 278 | + | downloadedJSON, err := json.Marshal(map[string]string{ | |||
| 279 | + | "Path": "github.com/bnema/purego-cef2gtk", "Version": version, "Info": infoPath, | |||
| 280 | + | }) | |||
| 281 | + | require.NoError(t, err) | |||
| 282 | + | binDir := filepath.Join(temp, "bin") | |||
| 283 | + | require.NoError(t, os.Mkdir(binDir, 0o755)) | |||
| 284 | + | goBin := filepath.Join(binDir, "go") | |||
| 285 | + | script := fmt.Sprintf(`#!/bin/sh | |||
| 286 | + | if [ "$1" = "list" ] && [ "$2" = "-m" ] && [ "$3" = "-json" ] && [ "$4" = "github.com/bnema/purego-cef2gtk" ]; then | |||
| 287 | + | printf '%%s\n' '%s' | |||
| 288 | + | exit 0 | |||
| 289 | + | fi | |||
| 290 | + | if [ "$1" = "mod" ] && [ "$2" = "download" ] && [ "$3" = "-json" ] && [ "$4" = "github.com/bnema/purego-cef2gtk@%s" ]; then | |||
| 291 | + | printf '%%s\n' '%s' | |||
| 292 | + | exit 0 | |||
| 293 | + | fi | |||
| 294 | + | exit 1 | |||
| 295 | + | `, selectedJSON, version, downloadedJSON) | |||
| 296 | + | require.NoError(t, os.WriteFile(goBin, []byte(script), 0o755)) | |||
| 297 | + | return goBin | |||
| 298 | + | } | |||
| 299 | + | ||||
| 169 | func TestFirstPresentationCollectorDefaultsToXDGStateEvidenceDirectory(t *testing.T) { | 300 | func TestFirstPresentationCollectorDefaultsToXDGStateEvidenceDirectory(t *testing.T) { | ||
| 170 | repoRoot, err := filepath.Abs(filepath.Join("..", "..")) | 301 | repoRoot, err := filepath.Abs(filepath.Join("..", "..")) | ||
| 171 | require.NoError(t, err) | 302 | require.NoError(t, err) | ||
M scripts/collect_first_presentation.sh +78 -9
| @@ -31,8 +31,78 @@ else | |||
| 31 | 31 | fi | |
| 32 | 32 | readonly output | |
| 33 | 33 | readonly upstream_module="github.com/bnema/purego-cef2gtk" | |
| 34 | - | readonly upstream_tag="v0.8.4" | |
| 35 | - | readonly upstream_revision="f217ece342dea3ef2a3f98671fcd16a39ad0037d" | |
| 34 | + | ||
| 35 | + | # Resolve the version selected by this checkout, then obtain its immutable VCS | |
| 36 | + | # origin from Go's cached module metadata. Do not infer a revision from a tag, | |
| 37 | + | # a branch, or a truncated pseudo-version suffix. | |
| 38 | + | resolve_upstream_provenance() { | |
| 39 | + | local selected_metadata selected_version downloaded_metadata | |
| 40 | + | ||
| 41 | + | selected_metadata="$(go list -m -json "$upstream_module" 2>/dev/null)" || { | |
| 42 | + | echo "first-presentation: immutable module provenance is unavailable" >&2 | |
| 43 | + | exit 2 | |
| 44 | + | } | |
| 45 | + | selected_version="$(python3 - "$upstream_module" "$selected_metadata" <<'PY' | |
| 46 | + | import json, sys | |
| 47 | + | try: | |
| 48 | + | metadata = json.loads(sys.argv[2]) | |
| 49 | + | if metadata.get("Path") != sys.argv[1] or not isinstance(metadata.get("Version"), str): | |
| 50 | + | raise ValueError | |
| 51 | + | print(metadata["Version"]) | |
| 52 | + | except (AttributeError, TypeError, ValueError, json.JSONDecodeError): | |
| 53 | + | raise SystemExit("first-presentation: immutable module provenance is unavailable") | |
| 54 | + | PY | |
| 55 | + | )" || exit $? | |
| 56 | + | downloaded_metadata="$(go mod download -json "$upstream_module@$selected_version" 2>/dev/null)" || { | |
| 57 | + | echo "first-presentation: immutable module provenance is unavailable" >&2 | |
| 58 | + | exit 2 | |
| 59 | + | } | |
| 60 | + | ||
| 61 | + | python3 - "$upstream_module" "$selected_metadata" "$downloaded_metadata" <<'PY' | |
| 62 | + | import json, re, sys | |
| 63 | + | ||
| 64 | + | module, selected_raw, downloaded_raw = sys.argv[1:] | |
| 65 | + | ||
| 66 | + | def fail(): | |
| 67 | + | # Do not expose Go cache locations or other machine-local values. | |
| 68 | + | raise SystemExit("first-presentation: immutable module provenance is unavailable") | |
| 69 | + | ||
| 70 | + | try: | |
| 71 | + | selected = json.loads(selected_raw) | |
| 72 | + | downloaded = json.loads(downloaded_raw) | |
| 73 | + | version = selected["Version"] | |
| 74 | + | if selected.get("Path") != module or downloaded.get("Path") != module: | |
| 75 | + | fail() | |
| 76 | + | if downloaded.get("Version") != version: | |
| 77 | + | fail() | |
| 78 | + | # A selected pseudo-version is an exact immutable selector, never a branch. | |
| 79 | + | match = re.fullmatch(r"(v\d+\.\d+\.\d+)-0\.\d{14}-([0-9a-f]{12})", version) | |
| 80 | + | if not match: | |
| 81 | + | fail() | |
| 82 | + | info_path = downloaded.get("Info") | |
| 83 | + | if not isinstance(info_path, str) or not info_path: | |
| 84 | + | fail() | |
| 85 | + | with open(info_path, encoding="utf-8") as info_file: | |
| 86 | + | info = json.load(info_file) | |
| 87 | + | origin = info.get("Origin") or downloaded.get("Origin") | |
| 88 | + | if info.get("Version") != version or not isinstance(origin, dict): | |
| 89 | + | fail() | |
| 90 | + | revision = origin.get("Hash") | |
| 91 | + | if origin.get("VCS") != "git" or origin.get("URL") != "https://github.com/bnema/purego-cef2gtk": | |
| 92 | + | fail() | |
| 93 | + | if not isinstance(revision, str) or not re.fullmatch(r"[0-9a-f]{40}", revision): | |
| 94 | + | fail() | |
| 95 | + | if not revision.startswith(match.group(2)): | |
| 96 | + | fail() | |
| 97 | + | # A named ref can move. Only the immutable hash itself is acceptable. | |
| 98 | + | if origin.get("Ref") not in (None, "", revision): | |
| 99 | + | fail() | |
| 100 | + | except (AttributeError, KeyError, OSError, TypeError, ValueError, json.JSONDecodeError): | |
| 101 | + | fail() | |
| 102 | + | ||
| 103 | + | print("\t".join((version, match.group(1), revision))) | |
| 104 | + | PY | |
| 105 | + | } | |
| 36 | 106 | ||
| 37 | 107 | # The artifact destination is caller-controlled. Never empty or recursively | |
| 38 | 108 | # clear it: collection only writes to a newly-created directory whose parent is | |
| @@ -66,10 +136,9 @@ prepare_output | |||
| 66 | 136 | [[ -x "$binary" ]] || { echo "first-presentation: executable not found: $binary" >&2; exit 2; } | |
| 67 | 137 | [[ -d "$runtime" ]] || { echo "first-presentation: CEF runtime not found: $runtime" >&2; exit 2; } | |
| 68 | 138 | [[ -n "${WAYLAND_DISPLAY:-}${DISPLAY:-}" ]] || { echo "first-presentation: a current Wayland/X11 display is required" >&2; exit 2; } | |
| 69 | - | [[ "$(go list -m -f '{{.Version}}' "$upstream_module")" == "$upstream_tag" ]] || { | |
| 70 | - | echo "first-presentation: expected $upstream_module@$upstream_tag" >&2 | |
| 71 | - | exit 2 | |
| 72 | - | } | |
| 139 | + | upstream_provenance="$(resolve_upstream_provenance)" || exit $? | |
| 140 | + | IFS=$'\t' read -r upstream_version upstream_tag upstream_revision <<<"$upstream_provenance" | |
| 141 | + | readonly upstream_version upstream_tag upstream_revision | |
| 73 | 142 | ||
| 74 | 143 | # Raw logs and temporary XDG homes may contain machine-local paths. Keep them | |
| 75 | 144 | # outside the committed artifact directory and always remove them. | |
| @@ -80,9 +149,9 @@ cleanup_work_root() { | |||
| 80 | 149 | rm -rf -- "$work_root" | |
| 81 | 150 | } | |
| 82 | 151 | trap cleanup_work_root EXIT | |
| 83 | - | python3 - "$output/metadata.json" "$binary" "$timeout_seconds" "$upstream_module" "$upstream_tag" "$upstream_revision" <<'PY' | |
| 152 | + | python3 - "$output/metadata.json" "$binary" "$timeout_seconds" "$upstream_module" "$upstream_version" "$upstream_tag" "$upstream_revision" <<'PY' | |
| 84 | 153 | import hashlib, json, os, platform, subprocess, sys | |
| 85 | - | path, binary, timeout, upstream_module, upstream_tag, upstream_revision = sys.argv[1:] | |
| 154 | + | path, binary, timeout, upstream_module, upstream_version, upstream_tag, upstream_revision = sys.argv[1:] | |
| 86 | 155 | with open(binary, "rb") as candidate: | |
| 87 | 156 | binary_sha256 = hashlib.file_digest(candidate, "sha256").hexdigest() | |
| 88 | 157 | ||
| @@ -102,7 +171,7 @@ json.dump({ | |||
| 102 | 171 | "binary": {"label": "dumber", "sha256": binary_sha256}, | |
| 103 | 172 | "timeout_seconds": int(timeout), | |
| 104 | 173 | "measured_source_revision": subprocess.check_output(["git", "-c", f"safe.directory={os.getcwd()}", "rev-parse", "HEAD"], text=True).strip(), | |
| 105 | - | "upstream": {"module": upstream_module, "tag": upstream_tag, "revision": upstream_revision}, | |
| 174 | + | "upstream": {"module": upstream_module, "version": upstream_version, "tag": upstream_tag, "revision": upstream_revision}, | |
| 106 | 175 | "comparison": {"os": os_label, "architecture": architecture, "display_protocol": display_protocol, "machine_gpu_profile": gpu_profile}, | |
| 107 | 176 | "render_configuration": {"backend": "gdk-dmabuf", "buffer_sharing": "dmabuf", "renderer": "vulkan"} | |
| 108 | 177 | }, open(path, "w"), indent=2, sort_keys=True) | |
| @@ -31,8 +31,78 @@ else | |||||
| 31 | fi | 31 | fi | ||
| 32 | readonly output | 32 | readonly output | ||
| 33 | readonly upstream_module="github.com/bnema/purego-cef2gtk" | 33 | readonly upstream_module="github.com/bnema/purego-cef2gtk" | ||
| 34 | - | readonly upstream_tag="v0.8.4" | 34 | + | |
| 35 | - | readonly upstream_revision="f217ece342dea3ef2a3f98671fcd16a39ad0037d" | 35 | + | # Resolve the version selected by this checkout, then obtain its immutable VCS |
| 36 | + | # origin from Go's cached module metadata. Do not infer a revision from a tag, | |||
| 37 | + | # a branch, or a truncated pseudo-version suffix. | |||
| 38 | + | resolve_upstream_provenance() { | |||
| 39 | + | local selected_metadata selected_version downloaded_metadata | |||
| 40 | + | ||||
| 41 | + | selected_metadata="$(go list -m -json "$upstream_module" 2>/dev/null)" || { | |||
| 42 | + | echo "first-presentation: immutable module provenance is unavailable" >&2 | |||
| 43 | + | exit 2 | |||
| 44 | + | } | |||
| 45 | + | selected_version="$(python3 - "$upstream_module" "$selected_metadata" <<'PY' | |||
| 46 | + | import json, sys | |||
| 47 | + | try: | |||
| 48 | + | metadata = json.loads(sys.argv[2]) | |||
| 49 | + | if metadata.get("Path") != sys.argv[1] or not isinstance(metadata.get("Version"), str): | |||
| 50 | + | raise ValueError | |||
| 51 | + | print(metadata["Version"]) | |||
| 52 | + | except (AttributeError, TypeError, ValueError, json.JSONDecodeError): | |||
| 53 | + | raise SystemExit("first-presentation: immutable module provenance is unavailable") | |||
| 54 | + | PY | |||
| 55 | + | )" || exit $? | |||
| 56 | + | downloaded_metadata="$(go mod download -json "$upstream_module@$selected_version" 2>/dev/null)" || { | |||
| 57 | + | echo "first-presentation: immutable module provenance is unavailable" >&2 | |||
| 58 | + | exit 2 | |||
| 59 | + | } | |||
| 60 | + | ||||
| 61 | + | python3 - "$upstream_module" "$selected_metadata" "$downloaded_metadata" <<'PY' | |||
| 62 | + | import json, re, sys | |||
| 63 | + | ||||
| 64 | + | module, selected_raw, downloaded_raw = sys.argv[1:] | |||
| 65 | + | ||||
| 66 | + | def fail(): | |||
| 67 | + | # Do not expose Go cache locations or other machine-local values. | |||
| 68 | + | raise SystemExit("first-presentation: immutable module provenance is unavailable") | |||
| 69 | + | ||||
| 70 | + | try: | |||
| 71 | + | selected = json.loads(selected_raw) | |||
| 72 | + | downloaded = json.loads(downloaded_raw) | |||
| 73 | + | version = selected["Version"] | |||
| 74 | + | if selected.get("Path") != module or downloaded.get("Path") != module: | |||
| 75 | + | fail() | |||
| 76 | + | if downloaded.get("Version") != version: | |||
| 77 | + | fail() | |||
| 78 | + | # A selected pseudo-version is an exact immutable selector, never a branch. | |||
| 79 | + | match = re.fullmatch(r"(v\d+\.\d+\.\d+)-0\.\d{14}-([0-9a-f]{12})", version) | |||
| 80 | + | if not match: | |||
| 81 | + | fail() | |||
| 82 | + | info_path = downloaded.get("Info") | |||
| 83 | + | if not isinstance(info_path, str) or not info_path: | |||
| 84 | + | fail() | |||
| 85 | + | with open(info_path, encoding="utf-8") as info_file: | |||
| 86 | + | info = json.load(info_file) | |||
| 87 | + | origin = info.get("Origin") or downloaded.get("Origin") | |||
| 88 | + | if info.get("Version") != version or not isinstance(origin, dict): | |||
| 89 | + | fail() | |||
| 90 | + | revision = origin.get("Hash") | |||
| 91 | + | if origin.get("VCS") != "git" or origin.get("URL") != "https://github.com/bnema/purego-cef2gtk": | |||
| 92 | + | fail() | |||
| 93 | + | if not isinstance(revision, str) or not re.fullmatch(r"[0-9a-f]{40}", revision): | |||
| 94 | + | fail() | |||
| 95 | + | if not revision.startswith(match.group(2)): | |||
| 96 | + | fail() | |||
| 97 | + | # A named ref can move. Only the immutable hash itself is acceptable. | |||
| 98 | + | if origin.get("Ref") not in (None, "", revision): | |||
| 99 | + | fail() | |||
| 100 | + | except (AttributeError, KeyError, OSError, TypeError, ValueError, json.JSONDecodeError): | |||
| 101 | + | fail() | |||
| 102 | + | ||||
| 103 | + | print("\t".join((version, match.group(1), revision))) | |||
| 104 | + | PY | |||
| 105 | + | } | |||
| 36 | 106 | ||||
| 37 | # The artifact destination is caller-controlled. Never empty or recursively | 107 | # The artifact destination is caller-controlled. Never empty or recursively | ||
| 38 | # clear it: collection only writes to a newly-created directory whose parent is | 108 | # clear it: collection only writes to a newly-created directory whose parent is | ||
| @@ -66,10 +136,9 @@ prepare_output | |||||
| 66 | [[ -x "$binary" ]] || { echo "first-presentation: executable not found: $binary" >&2; exit 2; } | 136 | [[ -x "$binary" ]] || { echo "first-presentation: executable not found: $binary" >&2; exit 2; } | ||
| 67 | [[ -d "$runtime" ]] || { echo "first-presentation: CEF runtime not found: $runtime" >&2; exit 2; } | 137 | [[ -d "$runtime" ]] || { echo "first-presentation: CEF runtime not found: $runtime" >&2; exit 2; } | ||
| 68 | [[ -n "${WAYLAND_DISPLAY:-}${DISPLAY:-}" ]] || { echo "first-presentation: a current Wayland/X11 display is required" >&2; exit 2; } | 138 | [[ -n "${WAYLAND_DISPLAY:-}${DISPLAY:-}" ]] || { echo "first-presentation: a current Wayland/X11 display is required" >&2; exit 2; } | ||
| 69 | - | [[ "$(go list -m -f '{{.Version}}' "$upstream_module")" == "$upstream_tag" ]] || { | 139 | + | upstream_provenance="$(resolve_upstream_provenance)" || exit $? |
| 70 | - | echo "first-presentation: expected $upstream_module@$upstream_tag" >&2 | 140 | + | IFS=$'\t' read -r upstream_version upstream_tag upstream_revision <<<"$upstream_provenance" |
| 71 | - | exit 2 | 141 | + | readonly upstream_version upstream_tag upstream_revision |
| 72 | - | } | |||
| 73 | 142 | ||||
| 74 | # Raw logs and temporary XDG homes may contain machine-local paths. Keep them | 143 | # Raw logs and temporary XDG homes may contain machine-local paths. Keep them | ||
| 75 | # outside the committed artifact directory and always remove them. | 144 | # outside the committed artifact directory and always remove them. | ||
| @@ -80,9 +149,9 @@ cleanup_work_root() { | |||||
| 80 | rm -rf -- "$work_root" | 149 | rm -rf -- "$work_root" | ||
| 81 | } | 150 | } | ||
| 82 | trap cleanup_work_root EXIT | 151 | trap cleanup_work_root EXIT | ||
| 83 | - | python3 - "$output/metadata.json" "$binary" "$timeout_seconds" "$upstream_module" "$upstream_tag" "$upstream_revision" <<'PY' | 152 | + | python3 - "$output/metadata.json" "$binary" "$timeout_seconds" "$upstream_module" "$upstream_version" "$upstream_tag" "$upstream_revision" <<'PY' |
| 84 | import hashlib, json, os, platform, subprocess, sys | 153 | import hashlib, json, os, platform, subprocess, sys | ||
| 85 | - | path, binary, timeout, upstream_module, upstream_tag, upstream_revision = sys.argv[1:] | 154 | + | path, binary, timeout, upstream_module, upstream_version, upstream_tag, upstream_revision = sys.argv[1:] |
| 86 | with open(binary, "rb") as candidate: | 155 | with open(binary, "rb") as candidate: | ||
| 87 | binary_sha256 = hashlib.file_digest(candidate, "sha256").hexdigest() | 156 | binary_sha256 = hashlib.file_digest(candidate, "sha256").hexdigest() | ||
| 88 | 157 | ||||
| @@ -102,7 +171,7 @@ json.dump({ | |||||
| 102 | "binary": {"label": "dumber", "sha256": binary_sha256}, | 171 | "binary": {"label": "dumber", "sha256": binary_sha256}, | ||
| 103 | "timeout_seconds": int(timeout), | 172 | "timeout_seconds": int(timeout), | ||
| 104 | "measured_source_revision": subprocess.check_output(["git", "-c", f"safe.directory={os.getcwd()}", "rev-parse", "HEAD"], text=True).strip(), | 173 | "measured_source_revision": subprocess.check_output(["git", "-c", f"safe.directory={os.getcwd()}", "rev-parse", "HEAD"], text=True).strip(), | ||
| 105 | - | "upstream": {"module": upstream_module, "tag": upstream_tag, "revision": upstream_revision}, | 174 | + | "upstream": {"module": upstream_module, "version": upstream_version, "tag": upstream_tag, "revision": upstream_revision}, |
| 106 | "comparison": {"os": os_label, "architecture": architecture, "display_protocol": display_protocol, "machine_gpu_profile": gpu_profile}, | 175 | "comparison": {"os": os_label, "architecture": architecture, "display_protocol": display_protocol, "machine_gpu_profile": gpu_profile}, | ||
| 107 | "render_configuration": {"backend": "gdk-dmabuf", "buffer_sharing": "dmabuf", "renderer": "vulkan"} | 176 | "render_configuration": {"backend": "gdk-dmabuf", "buffer_sharing": "dmabuf", "renderer": "vulkan"} | ||
| 108 | }, open(path, "w"), indent=2, sort_keys=True) | 177 | }, open(path, "w"), indent=2, sort_keys=True) | ||
M vendor/github.com/bnema/purego-cef/cef/bridge.go +8 -13 generated file: collapsed
M vendor/github.com/bnema/purego-cef2gtk/internal/cefadapter/accelerated_paint.go +34 -37 generated file: collapsed
M vendor/github.com/bnema/purego-cef2gtk/internal/dmabuf/frame.go +38 -19 generated file: collapsed
M vendor/github.com/bnema/purego-cef2gtk/internal/gtkgdk/renderer.go +89 -69 generated file: collapsed
M vendor/github.com/bnema/purego-pipewire/internal/core/player.go +5 -0 generated file: collapsed
M vendor/github.com/bnema/purego-pipewire/internal/core/player_rt.go +10 -6 generated file: collapsed
M vendor/github.com/bnema/purego-pipewire/internal/core/pwbuffer.go +66 -32 generated file: collapsed
M vendor/github.com/bnema/purego-sqlite/driver/driver.go +268 -63 generated file: collapsed
M vendor/github.com/bnema/purego-sqlite/internal/core/db.go +8 -0 generated file: collapsed
M vendor/github.com/bnema/purego-sqlite/internal/core/rows.go +13 -0 generated file: collapsed
M vendor/github.com/bnema/purego-sqlite/internal/loader/loader.go +23 -5 generated file: collapsed
M vendor/github.com/bnema/purego-sqlite/internal/ports/in/ports_gen.go +3 -0 generated file: collapsed
M vendor/github.com/bnema/puregotk/internal/core/core.go +197 -4 generated file: collapsed
M vendor/github.com/bnema/puregotk/pkg/core/core.go +10 -0 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-about-dialog.go +99 -64 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-about-window.go +95 -62 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-accent-color.go +7 -15 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-action-row.go +33 -29 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-alert-dialog.go +66 -47 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-animation-target.go +10 -27 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-animation-util.go +4 -12 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-animation.go +24 -26 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-application-window.go +14 -22 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-application.go +3 -15 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-avatar.go +22 -25 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-banner.go +23 -26 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-bin.go +5 -16 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-bottom-sheet.go +47 -38 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-breakpoint-bin.go +10 -19 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-breakpoint.go +33 -37 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-button-content.go +18 -22 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-button-row.go +10 -18 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-carousel-indicator-dots.go +5 -16 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-carousel-indicator-lines.go +5 -16 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-carousel.go +47 -37 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-clamp-layout.go +14 -20 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-clamp-scrollable.go +17 -22 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-clamp.go +17 -22 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-combo-row.go +34 -33 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-dialog.go +45 -38 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-easing.go +3 -13 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-entry-row.go +40 -33 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-enum-list-model.go +13 -22 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-expander-row.go +40 -33 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-flap.go +61 -48 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-fold-threshold-policy.go +10 -1 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-header-bar.go +36 -33 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-inline-view-switcher.go +18 -24 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-layout-slot.go +4 -15 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-layout.go +7 -17 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-leaflet.go +69 -56 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-length-unit.go +5 -14 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-main.go +5 -15 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-message-dialog.go +63 -44 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-multi-layout-view.go +17 -23 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-navigation-direction.go +10 -1 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-navigation-split-view.go +36 -32 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-navigation-view.go +60 -49 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-overlay-split-view.go +48 -38 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-password-entry-row.go +2 -13 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-preferences-dialog.go +23 -25 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-preferences-group.go +24 -26 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-preferences-page.go +38 -33 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-preferences-row.go +18 -22 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-preferences-window.go +31 -29 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-shortcut-label.go +10 -18 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-shortcuts-dialog.go +4 -15 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-shortcuts-item.go +23 -25 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-shortcuts-section.go +8 -17 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-sidebar-item.go +45 -37 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-sidebar-section.go +24 -27 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-sidebar.go +41 -39 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-spin-row.go +40 -34 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-spinner-paintable.go +5 -16 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-spinner.go +2 -13 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-split-button.go +39 -34 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-spring-animation.go +34 -30 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-spring-params.go +17 -21 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-squeezer.go +49 -44 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-status-page.go +20 -24 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-style-manager.go +25 -28 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-swipe-tracker.go +33 -30 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-swipeable.go +33 -21 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-switch-row.go +6 -16 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-tab-bar.go +35 -32 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-tab-button.go +5 -16 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-tab-overview.go +45 -37 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-tab-view.go +123 -87 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-timed-animation.go +30 -28 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-toast-overlay.go +9 -18 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-toast.go +41 -36 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-toggle-group.go +64 -51 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-toolbar-view.go +40 -35 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-version.go +7 -16 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-view-stack.go +78 -62 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-view-switcher-bar.go +9 -18 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-view-switcher-sidebar.go +15 -22 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-view-switcher-title.go +19 -23 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-view-switcher.go +10 -20 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-window-title.go +10 -18 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-window.go +14 -22 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-wrap-box.go +66 -46 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-wrap-layout.go +57 -46 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/cairo/main.go +36 -79 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkapplaunchcontext.go +10 -17 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkcairo.go +12 -16 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkcairocontext.go +3 -13 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkcicpparams.go +20 -25 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkclipboard.go +34 -32 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkcolorstate.go +12 -16 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkcontentdeserializer.go +26 -27 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkcontentformats.go +28 -31 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkcontentprovider.go +23 -28 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkcontentserializer.go +26 -27 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkcursor.go +12 -21 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkdevice.go +36 -33 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkdevicepad.go +27 -22 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkdevicetool.go +10 -18 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkdisplay.go +51 -43 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkdisplaymanager.go +10 -20 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkdmabuftexture.go +3 -13 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkdmabuftexturebuilder.go +53 -41 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkdrag.go +20 -28 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkdragsurface.go +6 -14 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkdragsurfacesize.go +3 -13 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkdrawcontext.go +11 -18 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkdrop.go +19 -24 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkenums.go +21 -1 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkevents.go +120 -118 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkframeclock.go +22 -24 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkframetimings.go +17 -20 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkglcontext.go +40 -36 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkgltexture.go +4 -15 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkgltexturebuilder.go +41 -35 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkkeys.go +19 -22 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkmemorytexture.go +2 -13 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkmemorytexturebuilder.go +42 -35 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkmonitor.go +27 -27 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkpaintable.go +63 -33 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkpango.go +4 -12 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkpixbuf.go +2 -12 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkpopup.go +47 -26 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkpopuplayout.go +36 -32 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkrgba.go +19 -21 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkseat.go +11 -20 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdksnapshot.go +7 -0 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdksurface.go +46 -40 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdktexture.go +27 -31 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdktoplevel.go +157 -66 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdktoplevellayout.go +24 -25 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdktoplevelsize.go +9 -16 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdktypes.go +95 -72 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkvulkancontext.go +3 -13 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdkpixbuf/gdk-pixbuf-animation.go +26 -32 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdkpixbuf/gdk-pixbuf-core.go +9 -0 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdkpixbuf/gdk-pixbuf-io.go +25 -23 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdkpixbuf/gdk-pixbuf-loader.go +13 -22 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdkpixbuf/gdk-pixbuf-simple-anim.go +8 -17 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdkpixbuf/gdk-pixbuf-transform.go +11 -1 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdkpixbuf/gdk-pixbuf.go +102 -79 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdkpixbuf/main.go +5 -17 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gaction.go +59 -31 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gactiongroup.go +96 -39 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gactionmap.go +33 -21 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gappinfo.go +244 -116 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gapplication.go +79 -55 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gapplicationcommandline.go +31 -27 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gasyncinitable.go +25 -22 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gasyncresult.go +26 -19 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gbufferedinputstream.go +26 -29 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gbufferedoutputstream.go +11 -18 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gbytesicon.go +4 -15 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gcancellable.go +26 -27 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gcharsetconverter.go +8 -17 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gcontenttype.go +30 -26 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gconverter.go +23 -20 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gconverterinputstream.go +3 -14 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gconverteroutputstream.go +3 -14 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gcredentials.go +12 -21 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdatagrambased.go +45 -30 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdatainputstream.go +31 -35 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdataoutputstream.go +14 -23 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdbusactiongroup.go +2 -13 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdbusaddress.go +10 -17 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdbusauthobserver.go +6 -16 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdbusconnection.go +77 -66 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdbuserror.go +16 -18 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdbusinterface.go +26 -19 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdbusinterfaceskeleton.go +25 -24 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdbusintrospection.go +54 -56 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdbusmenumodel.go +2 -13 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdbusmessage.go +88 -64 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdbusmethodinvocation.go +35 -30 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdbusnameowning.go +10 -15 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdbusnamewatching.go +10 -15 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdbusobject.go +19 -17 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdbusobjectmanager.go +26 -19 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdbusobjectmanagerclient.go +16 -23 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdbusobjectmanagerserver.go +13 -20 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdbusobjectproxy.go +3 -15 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdbusobjectskeleton.go +12 -18 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdbusproxy.go +42 -38 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdbusserver.go +14 -20 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdbusutils.go +24 -22 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdebugcontroller.go +12 -16 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdebugcontrollerdbus.go +4 -14 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdrive.go +214 -82 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdtlsclientconnection.go +34 -24 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdtlsconnection.go +207 -80 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdtlsserverconnection.go +2 -13 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gemblem.go +6 -17 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gemblemedicon.go +9 -18 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gfile.go +1148 -450 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gfileattribute.go +13 -19 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gfileenumerator.go +34 -35 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gfileicon.go +3 -15 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gfileinfo.go +138 -84 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gfileinputstream.go +17 -23 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gfileiostream.go +23 -27 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gfilemonitor.go +9 -15 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gfilenamecompleter.go +8 -16 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gfileoutputstream.go +23 -27 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gfilterinputstream.go +6 -14 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gfilteroutputstream.go +6 -14 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gicon.go +32 -25 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/ginetaddress.go +40 -34 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/ginetaddressmask.go +14 -21 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/ginetsocketaddress.go +10 -19 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/ginitable.go +11 -18 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/ginputstream.go +52 -48 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gioenums.go +90 -1 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gioerror.go +6 -13 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/giomodule.go +26 -29 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gioscheduler.go +4 -12 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/giostream.go +25 -29 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/giotypes.go +70 -60 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/giptosmessage.go +6 -16 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gipv6tclassmessage.go +6 -16 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/glistmodel.go +33 -21 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gliststore.go +22 -24 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gloadableicon.go +27 -23 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gmemoryinputstream.go +8 -17 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gmemorymonitor.go +2 -12 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gmemoryoutputstream.go +13 -19 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gmenu.go +62 -50 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gmenumodel.go +31 -33 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gmount.go +215 -86 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gmountoperation.go +40 -32 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gnativesocketaddress.go +2 -13 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gnativevolumemonitor.go +7 -0 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gnetworkaddress.go +11 -21 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gnetworking.go +3 -14 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gnetworkmonitor.go +49 -31 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gnetworkservice.go +12 -19 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gnotification.go +26 -26 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/goutputstream.go +86 -72 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gpermission.go +33 -33 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gpollableinputstream.go +30 -22 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gpollableoutputstream.go +41 -27 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gpollableutils.go +7 -15 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gpowerprofilemonitor.go +7 -16 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gpropertyaction.go +2 -13 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gproxy.go +35 -27 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gproxyaddress.go +16 -21 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gproxyaddressenumerator.go +7 -0 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gproxyresolver.go +35 -27 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gremoteactiongroup.go +12 -15 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gresolver.go +75 -67 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gresource.go +19 -23 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gseekable.go +41 -27 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gsettings.go +99 -67 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gsettingsbackend.go +19 -24 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gsettingsschema.go +48 -43 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gsimpleaction.go +9 -18 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gsimpleactiongroup.go +9 -18 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gsimpleasyncresult.go +46 -40 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gsimpleiostream.go +2 -13 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gsimplepermission.go +2 -13 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gsimpleproxyresolver.go +8 -16 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gsocket.go +87 -72 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gsocketaddress.go +11 -19 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gsocketaddressenumerator.go +13 -20 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gsocketclient.go +54 -44 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gsocketconnectable.go +19 -17 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gsocketconnection.go +14 -21 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gsocketcontrolmessage.go +10 -17 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gsocketlistener.go +18 -25 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gsocketservice.go +8 -16 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gsrvtarget.go +2 -11 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gsubprocess.go +40 -39 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gsubprocesslauncher.go +34 -31 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gtask.go +70 -52 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gtcpconnection.go +5 -14 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gtcpwrapperconnection.go +3 -15 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gtestdbus.go +16 -22 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/gio/gthemedicon.go +10 -19 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/gio/gthreadedresolver.go +7 -0 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/gio/gthreadedsocketservice.go +2 -12 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/gio/gtlsbackend.go +69 -33 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/gio/gtlscertificate.go +25 -29 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/gio/gtlsclientconnection.go +55 -29 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/gio/gtlsconnection.go +56 -46 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/gio/gtlsdatabase.go +51 -48 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/gio/gtlsfiledatabase.go +2 -13 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/gio/gtlsinteraction.go +27 -31 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/gio/gtlspassword.go +20 -22 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/gio/gtlsserverconnection.go +2 -13 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/gio/gunixconnection.go +11 -20 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/gio/gunixcredentialsmessage.go +6 -17 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/gio/gunixfdlist.go +11 -19 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/gio/gunixsocketaddress.go +14 -22 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/gio/gvfs.go +18 -24 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/gio/gvolume.go +143 -58 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/gio/gvolumemonitor.go +11 -19 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/gio/gzlibcompressor.go +9 -18 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/gio/gzlibdecompressor.go +3 -15 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/gio/main.go +2 -11 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gallocator.go +32 -28 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/garray.go +82 -59 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gasyncqueue.go +56 -39 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gatomic.go +43 -34 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gbacktrace.go +5 -15 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gbase64.go +13 -19 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gbitlock.go +23 -24 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gbookmarkfile.go +69 -61 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gcache.go +10 -15 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gcharset.go +13 -19 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gchecksum.go +23 -25 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gcompletion.go +14 -17 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gconvert.go +25 -28 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gdataset.go +36 -28 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gdate.go +103 -65 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gdatetime.go +107 -66 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gdir.go +12 -19 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/genviron.go +17 -21 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gerror.go +30 -29 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gfileutils.go +45 -38 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/ggettext.go +13 -19 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/ghash.go +81 -53 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/ghmac.go +21 -24 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/ghook.go +28 -26 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/ghostutils.go +11 -18 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/giochannel.go +83 -67 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gkeyfile.go +72 -62 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/glib-types.go +4 -12 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/glist.go +2 -11 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gmain.go +181 -117 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gmappedfile.go +15 -21 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gmarkup.go +51 -43 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gmem.go +44 -31 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gmessages.go +70 -45 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gnode.go +50 -35 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/goption.go +57 -43 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gpathbuf.go +26 -24 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gpattern.go +19 -23 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gpoll.go +3 -13 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gprimes.go +3 -14 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gprintf.go +15 -20 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gqsort.go +5 -15 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gquark.go +13 -19 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gqueue.go +84 -52 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/grand.go +33 -30 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/grcbox.go +29 -27 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/grefcount.go +17 -21 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/grefstring.go +15 -20 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gregex.go +72 -57
| @@ -5,7 +5,6 @@ import ( | |||
| 5 | 5 | "structs" | |
| 6 | 6 | "unsafe" | |
| 7 | 7 | ||
| 8 | - | "github.com/bnema/purego" | |
| 9 | 8 | "github.com/bnema/puregotk/pkg/core" | |
| 10 | 9 | "github.com/bnema/puregotk/v4/gobject/types" | |
| 11 | 10 | ) | |
| @@ -25,6 +24,7 @@ type MatchInfo struct { | |||
| 25 | 24 | var xMatchInfoGLibType func() types.GType | |
| 26 | 25 | ||
| 27 | 26 | func MatchInfoGLibType() types.GType { | |
| 27 | + | core.LazyRegister(&xMatchInfoGLibType, "GLIB", "g_match_info_get_type", false) | |
| 28 | 28 | return xMatchInfoGLibType() | |
| 29 | 29 | } | |
| 30 | 30 | ||
| @@ -60,6 +60,7 @@ var xMatchInfoExpandReferences func(uintptr, string, **Error) string | |||
| 60 | 60 | // Use g_regex_check_replacement() to find out whether @string_to_expand | |
| 61 | 61 | // contains references. | |
| 62 | 62 | func (x *MatchInfo) ExpandReferences(StringToExpandVar string) (string, error) { | |
| 63 | + | core.LazyRegister(&xMatchInfoExpandReferences, "GLIB", "g_match_info_expand_references", false) | |
| 63 | 64 | var cerr *Error | |
| 64 | 65 | ||
| 65 | 66 | cret := xMatchInfoExpandReferences(x.GoPointer(), StringToExpandVar, &cerr) | |
| @@ -88,6 +89,8 @@ var xMatchInfoFetch func(uintptr, int) string | |||
| 88 | 89 | // The string is fetched from the string passed to the match function, | |
| 89 | 90 | // so you cannot call this function after freeing the string. | |
| 90 | 91 | func (x *MatchInfo) Fetch(MatchNumVar int) string { | |
| 92 | + | core.LazyRegister(&xMatchInfoFetch, "GLIB", "g_match_info_fetch", false) | |
| 93 | + | ||
| 91 | 94 | cret := xMatchInfoFetch(x.GoPointer(), MatchNumVar) | |
| 92 | 95 | return cret | |
| 93 | 96 | } | |
| @@ -111,6 +114,8 @@ var xMatchInfoFetchAll func(uintptr) []string | |||
| 111 | 114 | // The strings are fetched from the string passed to the match function, | |
| 112 | 115 | // so you cannot call this function after freeing the string. | |
| 113 | 116 | func (x *MatchInfo) FetchAll() []string { | |
| 117 | + | core.LazyRegister(&xMatchInfoFetchAll, "GLIB", "g_match_info_fetch_all", false) | |
| 118 | + | ||
| 114 | 119 | cret := xMatchInfoFetchAll(x.GoPointer()) | |
| 115 | 120 | return cret | |
| 116 | 121 | } | |
| @@ -126,6 +131,8 @@ var xMatchInfoFetchNamed func(uintptr, string) string | |||
| 126 | 131 | // The string is fetched from the string passed to the match function, | |
| 127 | 132 | // so you cannot call this function after freeing the string. | |
| 128 | 133 | func (x *MatchInfo) FetchNamed(NameVar string) string { | |
| 134 | + | core.LazyRegister(&xMatchInfoFetchNamed, "GLIB", "g_match_info_fetch_named", false) | |
| 135 | + | ||
| 129 | 136 | cret := xMatchInfoFetchNamed(x.GoPointer(), NameVar) | |
| 130 | 137 | return cret | |
| 131 | 138 | } | |
| @@ -141,6 +148,8 @@ var xMatchInfoFetchNamedPos func(uintptr, string, *int, *int) bool | |||
| 141 | 148 | // As @end_pos is set to the byte after the final byte of the match (on success), | |
| 142 | 149 | // the length of the match can be calculated as `end_pos - start_pos`. | |
| 143 | 150 | func (x *MatchInfo) FetchNamedPos(NameVar string, StartPosVar *int, EndPosVar *int) bool { | |
| 151 | + | core.LazyRegister(&xMatchInfoFetchNamedPos, "GLIB", "g_match_info_fetch_named_pos", false) | |
| 152 | + | ||
| 144 | 153 | cret := xMatchInfoFetchNamedPos(x.GoPointer(), NameVar, StartPosVar, EndPosVar) | |
| 145 | 154 | return cret | |
| 146 | 155 | } | |
| @@ -355,6 +364,8 @@ var xMatchInfoFetchPos func(uintptr, int, *int, *int) bool | |||
| 355 | 364 | // 3 N/A 0 2147483647 2147483647 | |
| 356 | 365 | // ``` | |
| 357 | 366 | func (x *MatchInfo) FetchPos(MatchNumVar int, StartPosVar *int, EndPosVar *int) bool { | |
| 367 | + | core.LazyRegister(&xMatchInfoFetchPos, "GLIB", "g_match_info_fetch_pos", false) | |
| 368 | + | ||
| 358 | 369 | cret := xMatchInfoFetchPos(x.GoPointer(), MatchNumVar, StartPosVar, EndPosVar) | |
| 359 | 370 | return cret | |
| 360 | 371 | } | |
| @@ -364,6 +375,8 @@ var xMatchInfoFree func(uintptr) | |||
| 364 | 375 | // If @match_info is not %NULL, calls g_match_info_unref(); otherwise does | |
| 365 | 376 | // nothing. | |
| 366 | 377 | func (x *MatchInfo) Free() { | |
| 378 | + | core.LazyRegister(&xMatchInfoFree, "GLIB", "g_match_info_free", false) | |
| 379 | + | ||
| 367 | 380 | xMatchInfoFree(x.GoPointer()) | |
| 368 | 381 | } | |
| 369 | 382 | ||
| @@ -378,6 +391,8 @@ var xMatchInfoGetMatchCount func(uintptr) int | |||
| 378 | 391 | // count is not that of the number of capturing parentheses but that of | |
| 379 | 392 | // the number of matched substrings. | |
| 380 | 393 | func (x *MatchInfo) GetMatchCount() int { | |
| 394 | + | core.LazyRegister(&xMatchInfoGetMatchCount, "GLIB", "g_match_info_get_match_count", false) | |
| 395 | + | ||
| 381 | 396 | cret := xMatchInfoGetMatchCount(x.GoPointer()) | |
| 382 | 397 | return cret | |
| 383 | 398 | } | |
| @@ -388,6 +403,8 @@ var xMatchInfoGetRegex func(uintptr) uintptr | |||
| 388 | 403 | // and must not be freed. Use g_regex_ref() if you need to keep it | |
| 389 | 404 | // after you free @match_info object. | |
| 390 | 405 | func (x *MatchInfo) GetRegex() *Regex { | |
| 406 | + | core.LazyRegister(&xMatchInfoGetRegex, "GLIB", "g_match_info_get_regex", false) | |
| 407 | + | ||
| 391 | 408 | cret := xMatchInfoGetRegex(x.GoPointer()) | |
| 392 | 409 | if cret == 0 { | |
| 393 | 410 | return nil | |
| @@ -401,6 +418,8 @@ var xMatchInfoGetString func(uintptr) string | |||
| 401 | 418 | // string passed to g_regex_match() or g_regex_replace() so | |
| 402 | 419 | // you may not free it before calling this function. | |
| 403 | 420 | func (x *MatchInfo) GetString() string { | |
| 421 | + | core.LazyRegister(&xMatchInfoGetString, "GLIB", "g_match_info_get_string", false) | |
| 422 | + | ||
| 404 | 423 | cret := xMatchInfoGetString(x.GoPointer()) | |
| 405 | 424 | return cret | |
| 406 | 425 | } | |
| @@ -441,6 +460,8 @@ var xMatchInfoIsPartialMatch func(uintptr) bool | |||
| 441 | 460 | // | |
| 442 | 461 | // See pcrepartial(3) for more information on partial matching. | |
| 443 | 462 | func (x *MatchInfo) IsPartialMatch() bool { | |
| 463 | + | core.LazyRegister(&xMatchInfoIsPartialMatch, "GLIB", "g_match_info_is_partial_match", false) | |
| 464 | + | ||
| 444 | 465 | cret := xMatchInfoIsPartialMatch(x.GoPointer()) | |
| 445 | 466 | return cret | |
| 446 | 467 | } | |
| @@ -449,6 +470,8 @@ var xMatchInfoMatches func(uintptr) bool | |||
| 449 | 470 | ||
| 450 | 471 | // Returns whether the previous match operation succeeded. | |
| 451 | 472 | func (x *MatchInfo) Matches() bool { | |
| 473 | + | core.LazyRegister(&xMatchInfoMatches, "GLIB", "g_match_info_matches", false) | |
| 474 | + | ||
| 452 | 475 | cret := xMatchInfoMatches(x.GoPointer()) | |
| 453 | 476 | return cret | |
| 454 | 477 | } | |
| @@ -462,6 +485,7 @@ var xMatchInfoNext func(uintptr, **Error) bool | |||
| 462 | 485 | // The match is done on the string passed to the match function, so you | |
| 463 | 486 | // cannot free it before calling this function. | |
| 464 | 487 | func (x *MatchInfo) Next() (bool, error) { | |
| 488 | + | core.LazyRegister(&xMatchInfoNext, "GLIB", "g_match_info_next", false) | |
| 465 | 489 | var cerr *Error | |
| 466 | 490 | ||
| 467 | 491 | cret := xMatchInfoNext(x.GoPointer(), &cerr) | |
| @@ -475,6 +499,8 @@ var xMatchInfoRef func(uintptr) uintptr | |||
| 475 | 499 | ||
| 476 | 500 | // Increases reference count of @match_info by 1. | |
| 477 | 501 | func (x *MatchInfo) Ref() *MatchInfo { | |
| 502 | + | core.LazyRegister(&xMatchInfoRef, "GLIB", "g_match_info_ref", false) | |
| 503 | + | ||
| 478 | 504 | cret := xMatchInfoRef(x.GoPointer()) | |
| 479 | 505 | if cret == 0 { | |
| 480 | 506 | return nil | |
| @@ -487,6 +513,8 @@ var xMatchInfoUnref func(uintptr) | |||
| 487 | 513 | // Decreases reference count of @match_info by 1. When reference count drops | |
| 488 | 514 | // to zero, it frees all the memory associated with the match_info structure. | |
| 489 | 515 | func (x *MatchInfo) Unref() { | |
| 516 | + | core.LazyRegister(&xMatchInfoUnref, "GLIB", "g_match_info_unref", false) | |
| 517 | + | ||
| 490 | 518 | xMatchInfoUnref(x.GoPointer()) | |
| 491 | 519 | } | |
| 492 | 520 | ||
| @@ -633,6 +661,7 @@ type Regex struct { | |||
| 633 | 661 | var xRegexGLibType func() types.GType | |
| 634 | 662 | ||
| 635 | 663 | func RegexGLibType() types.GType { | |
| 664 | + | core.LazyRegister(&xRegexGLibType, "GLIB", "g_regex_get_type", false) | |
| 636 | 665 | return xRegexGLibType() | |
| 637 | 666 | } | |
| 638 | 667 | ||
| @@ -653,6 +682,7 @@ var xNewRegex func(string, RegexCompileFlags, RegexMatchFlags, **Error) uintptr | |||
| 653 | 682 | // Compiles the regular expression to an internal form, and does | |
| 654 | 683 | // the initial setup of the #GRegex structure. | |
| 655 | 684 | func NewRegex(PatternVar string, CompileOptionsVar RegexCompileFlags, MatchOptionsVar RegexMatchFlags) (*Regex, error) { | |
| 685 | + | core.LazyRegister(&xNewRegex, "GLIB", "g_regex_new", false) | |
| 656 | 686 | var cerr *Error | |
| 657 | 687 | ||
| 658 | 688 | cret := xNewRegex(PatternVar, CompileOptionsVar, MatchOptionsVar, &cerr) | |
| @@ -669,6 +699,8 @@ var xRegexGetCaptureCount func(uintptr) int | |||
| 669 | 699 | ||
| 670 | 700 | // Returns the number of capturing subpatterns in the pattern. | |
| 671 | 701 | func (x *Regex) GetCaptureCount() int { | |
| 702 | + | core.LazyRegister(&xRegexGetCaptureCount, "GLIB", "g_regex_get_capture_count", false) | |
| 703 | + | ||
| 672 | 704 | cret := xRegexGetCaptureCount(x.GoPointer()) | |
| 673 | 705 | return cret | |
| 674 | 706 | } | |
| @@ -681,6 +713,8 @@ var xRegexGetCompileFlags func(uintptr) RegexCompileFlags | |||
| 681 | 713 | // include flags set by option expressions such as `(?i)` found at the | |
| 682 | 714 | // top-level within the compiled pattern. | |
| 683 | 715 | func (x *Regex) GetCompileFlags() RegexCompileFlags { | |
| 716 | + | core.LazyRegister(&xRegexGetCompileFlags, "GLIB", "g_regex_get_compile_flags", false) | |
| 717 | + | ||
| 684 | 718 | cret := xRegexGetCompileFlags(x.GoPointer()) | |
| 685 | 719 | return cret | |
| 686 | 720 | } | |
| @@ -689,6 +723,8 @@ var xRegexGetHasCrOrLf func(uintptr) bool | |||
| 689 | 723 | ||
| 690 | 724 | // Checks whether the pattern contains explicit CR or LF references. | |
| 691 | 725 | func (x *Regex) GetHasCrOrLf() bool { | |
| 726 | + | core.LazyRegister(&xRegexGetHasCrOrLf, "GLIB", "g_regex_get_has_cr_or_lf", false) | |
| 727 | + | ||
| 692 | 728 | cret := xRegexGetHasCrOrLf(x.GoPointer()) | |
| 693 | 729 | return cret | |
| 694 | 730 | } | |
| @@ -697,6 +733,8 @@ var xRegexGetMatchFlags func(uintptr) RegexMatchFlags | |||
| 697 | 733 | ||
| 698 | 734 | // Returns the match options that @regex was created with. | |
| 699 | 735 | func (x *Regex) GetMatchFlags() RegexMatchFlags { | |
| 736 | + | core.LazyRegister(&xRegexGetMatchFlags, "GLIB", "g_regex_get_match_flags", false) | |
| 737 | + | ||
| 700 | 738 | cret := xRegexGetMatchFlags(x.GoPointer()) | |
| 701 | 739 | return cret | |
| 702 | 740 | } | |
| @@ -707,6 +745,8 @@ var xRegexGetMaxBackref func(uintptr) int | |||
| 707 | 745 | // in the pattern, or 0 if the pattern does not contain | |
| 708 | 746 | // back references. | |
| 709 | 747 | func (x *Regex) GetMaxBackref() int { | |
| 748 | + | core.LazyRegister(&xRegexGetMaxBackref, "GLIB", "g_regex_get_max_backref", false) | |
| 749 | + | ||
| 710 | 750 | cret := xRegexGetMaxBackref(x.GoPointer()) | |
| 711 | 751 | return cret | |
| 712 | 752 | } | |
| @@ -717,6 +757,8 @@ var xRegexGetMaxLookbehind func(uintptr) int | |||
| 717 | 757 | // pattern. This information is useful when doing multi-segment matching using | |
| 718 | 758 | // the partial matching facilities. | |
| 719 | 759 | func (x *Regex) GetMaxLookbehind() int { | |
| 760 | + | core.LazyRegister(&xRegexGetMaxLookbehind, "GLIB", "g_regex_get_max_lookbehind", false) | |
| 761 | + | ||
| 720 | 762 | cret := xRegexGetMaxLookbehind(x.GoPointer()) | |
| 721 | 763 | return cret | |
| 722 | 764 | } | |
| @@ -726,6 +768,8 @@ var xRegexGetPattern func(uintptr) string | |||
| 726 | 768 | // Gets the pattern string associated with @regex, i.e. a copy of | |
| 727 | 769 | // the string passed to g_regex_new(). | |
| 728 | 770 | func (x *Regex) GetPattern() string { | |
| 771 | + | core.LazyRegister(&xRegexGetPattern, "GLIB", "g_regex_get_pattern", false) | |
| 772 | + | ||
| 729 | 773 | cret := xRegexGetPattern(x.GoPointer()) | |
| 730 | 774 | return cret | |
| 731 | 775 | } | |
| @@ -734,6 +778,8 @@ var xRegexGetStringNumber func(uintptr, string) int | |||
| 734 | 778 | ||
| 735 | 779 | // Retrieves the number of the subexpression named @name. | |
| 736 | 780 | func (x *Regex) GetStringNumber(NameVar string) int { | |
| 781 | + | core.LazyRegister(&xRegexGetStringNumber, "GLIB", "g_regex_get_string_number", false) | |
| 782 | + | ||
| 737 | 783 | cret := xRegexGetStringNumber(x.GoPointer(), NameVar) | |
| 738 | 784 | return cret | |
| 739 | 785 | } | |
| @@ -783,6 +829,8 @@ var xRegexMatch func(uintptr, string, RegexMatchFlags, **MatchInfo) bool | |||
| 783 | 829 | // you use any #GMatchInfo method (except g_match_info_free()) after | |
| 784 | 830 | // freeing or modifying @string then the behaviour is undefined. | |
| 785 | 831 | func (x *Regex) Match(StringVar string, MatchOptionsVar RegexMatchFlags, MatchInfoVar **MatchInfo) bool { | |
| 832 | + | core.LazyRegister(&xRegexMatch, "GLIB", "g_regex_match", false) | |
| 833 | + | ||
| 786 | 834 | cret := xRegexMatch(x.GoPointer(), StringVar, MatchOptionsVar, MatchInfoVar) | |
| 787 | 835 | return cret | |
| 788 | 836 | } | |
| @@ -804,6 +852,8 @@ var xRegexMatchAll func(uintptr, string, RegexMatchFlags, **MatchInfo) bool | |||
| 804 | 852 | // you use any #GMatchInfo method (except g_match_info_free()) after | |
| 805 | 853 | // freeing or modifying @string then the behaviour is undefined. | |
| 806 | 854 | func (x *Regex) MatchAll(StringVar string, MatchOptionsVar RegexMatchFlags, MatchInfoVar **MatchInfo) bool { | |
| 855 | + | core.LazyRegister(&xRegexMatchAll, "GLIB", "g_regex_match_all", false) | |
| 856 | + | ||
| 807 | 857 | cret := xRegexMatchAll(x.GoPointer(), StringVar, MatchOptionsVar, MatchInfoVar) | |
| 808 | 858 | return cret | |
| 809 | 859 | } | |
| @@ -849,6 +899,7 @@ var xRegexMatchAllFull func(uintptr, []string, int, int, RegexMatchFlags, **Matc | |||
| 849 | 899 | // you use any #GMatchInfo method (except g_match_info_free()) after | |
| 850 | 900 | // freeing or modifying @string then the behaviour is undefined. | |
| 851 | 901 | func (x *Regex) MatchAllFull(StringVar []string, StringLenVar int, StartPositionVar int, MatchOptionsVar RegexMatchFlags, MatchInfoVar **MatchInfo) (bool, error) { | |
| 902 | + | core.LazyRegister(&xRegexMatchAllFull, "GLIB", "g_regex_match_all_full", false) | |
| 852 | 903 | var cerr *Error | |
| 853 | 904 | ||
| 854 | 905 | cret := xRegexMatchAllFull(x.GoPointer(), StringVar, StringLenVar, StartPositionVar, MatchOptionsVar, MatchInfoVar, &cerr) | |
| @@ -914,6 +965,7 @@ var xRegexMatchFull func(uintptr, []string, int, int, RegexMatchFlags, **MatchIn | |||
| 914 | 965 | // | |
| 915 | 966 | // ]| | |
| 916 | 967 | func (x *Regex) MatchFull(StringVar []string, StringLenVar int, StartPositionVar int, MatchOptionsVar RegexMatchFlags, MatchInfoVar **MatchInfo) (bool, error) { | |
| 968 | + | core.LazyRegister(&xRegexMatchFull, "GLIB", "g_regex_match_full", false) | |
| 917 | 969 | var cerr *Error | |
| 918 | 970 | ||
| 919 | 971 | cret := xRegexMatchFull(x.GoPointer(), StringVar, StringLenVar, StartPositionVar, MatchOptionsVar, MatchInfoVar, &cerr) | |
| @@ -927,6 +979,8 @@ var xRegexRef func(uintptr) uintptr | |||
| 927 | 979 | ||
| 928 | 980 | // Increases reference count of @regex by 1. | |
| 929 | 981 | func (x *Regex) Ref() *Regex { | |
| 982 | + | core.LazyRegister(&xRegexRef, "GLIB", "g_regex_ref", false) | |
| 983 | + | ||
| 930 | 984 | cret := xRegexRef(x.GoPointer()) | |
| 931 | 985 | if cret == 0 { | |
| 932 | 986 | return nil | |
| @@ -963,6 +1017,7 @@ var xRegexReplace func(uintptr, []string, int, int, string, RegexMatchFlags, **E | |||
| 963 | 1017 | // string and setting %G_REGEX_MATCH_NOTBOL in the case of a pattern that | |
| 964 | 1018 | // begins with any kind of lookbehind assertion, such as "\b". | |
| 965 | 1019 | func (x *Regex) Replace(StringVar []string, StringLenVar int, StartPositionVar int, ReplacementVar string, MatchOptionsVar RegexMatchFlags) (string, error) { | |
| 1020 | + | core.LazyRegister(&xRegexReplace, "GLIB", "g_regex_replace", false) | |
| 966 | 1021 | var cerr *Error | |
| 967 | 1022 | ||
| 968 | 1023 | cret := xRegexReplace(x.GoPointer(), StringVar, StringLenVar, StartPositionVar, ReplacementVar, MatchOptionsVar, &cerr) | |
| @@ -1022,6 +1077,7 @@ var xRegexReplaceEval func(uintptr, []string, int, int, RegexMatchFlags, uintptr | |||
| 1022 | 1077 | // ... | |
| 1023 | 1078 | // ]| | |
| 1024 | 1079 | func (x *Regex) ReplaceEval(StringVar []string, StringLenVar int, StartPositionVar int, MatchOptionsVar RegexMatchFlags, EvalVar *RegexEvalCallback, UserDataVar uintptr) (string, error) { | |
| 1080 | + | core.LazyRegister(&xRegexReplaceEval, "GLIB", "g_regex_replace_eval", false) | |
| 1025 | 1081 | var cerr *Error | |
| 1026 | 1082 | ||
| 1027 | 1083 | cret := xRegexReplaceEval(x.GoPointer(), StringVar, StringLenVar, StartPositionVar, MatchOptionsVar, NewCallback(EvalVar), UserDataVar, &cerr) | |
| @@ -1042,6 +1098,7 @@ var xRegexReplaceLiteral func(uintptr, []string, int, int, string, RegexMatchFla | |||
| 1042 | 1098 | // case of a pattern that begins with any kind of lookbehind | |
| 1043 | 1099 | // assertion, such as "\b". | |
| 1044 | 1100 | func (x *Regex) ReplaceLiteral(StringVar []string, StringLenVar int, StartPositionVar int, ReplacementVar string, MatchOptionsVar RegexMatchFlags) (string, error) { | |
| 1101 | + | core.LazyRegister(&xRegexReplaceLiteral, "GLIB", "g_regex_replace_literal", false) | |
| 1045 | 1102 | var cerr *Error | |
| 1046 | 1103 | ||
| 1047 | 1104 | cret := xRegexReplaceLiteral(x.GoPointer(), StringVar, StringLenVar, StartPositionVar, ReplacementVar, MatchOptionsVar, &cerr) | |
| @@ -1071,6 +1128,8 @@ var xRegexSplit func(uintptr, string, RegexMatchFlags) []string | |||
| 1071 | 1128 | // For example splitting "ab c" using as a separator "\s*", you will get | |
| 1072 | 1129 | // "a", "b" and "c". | |
| 1073 | 1130 | func (x *Regex) Split(StringVar string, MatchOptionsVar RegexMatchFlags) []string { | |
| 1131 | + | core.LazyRegister(&xRegexSplit, "GLIB", "g_regex_split", false) | |
| 1132 | + | ||
| 1074 | 1133 | cret := xRegexSplit(x.GoPointer(), StringVar, MatchOptionsVar) | |
| 1075 | 1134 | return cret | |
| 1076 | 1135 | } | |
| @@ -1099,6 +1158,7 @@ var xRegexSplitFull func(uintptr, []string, int, int, RegexMatchFlags, int, **Er | |||
| 1099 | 1158 | // string and setting %G_REGEX_MATCH_NOTBOL in the case of a pattern | |
| 1100 | 1159 | // that begins with any kind of lookbehind assertion, such as "\b". | |
| 1101 | 1160 | func (x *Regex) SplitFull(StringVar []string, StringLenVar int, StartPositionVar int, MatchOptionsVar RegexMatchFlags, MaxTokensVar int) ([]string, error) { | |
| 1161 | + | core.LazyRegister(&xRegexSplitFull, "GLIB", "g_regex_split_full", false) | |
| 1102 | 1162 | var cerr *Error | |
| 1103 | 1163 | ||
| 1104 | 1164 | cret := xRegexSplitFull(x.GoPointer(), StringVar, StringLenVar, StartPositionVar, MatchOptionsVar, MaxTokensVar, &cerr) | |
| @@ -1113,6 +1173,8 @@ var xRegexUnref func(uintptr) | |||
| 1113 | 1173 | // Decreases reference count of @regex by 1. When reference count drops | |
| 1114 | 1174 | // to zero, it frees all the memory associated with the regex structure. | |
| 1115 | 1175 | func (x *Regex) Unref() { | |
| 1176 | + | core.LazyRegister(&xRegexUnref, "GLIB", "g_regex_unref", false) | |
| 1177 | + | ||
| 1116 | 1178 | xRegexUnref(x.GoPointer()) | |
| 1117 | 1179 | } | |
| 1118 | 1180 | ||
| @@ -1462,6 +1524,7 @@ var xRegexCheckReplacement func(string, *bool, **Error) bool | |||
| 1462 | 1524 | // about actual match, but '\0\1' (whole match followed by first | |
| 1463 | 1525 | // subpattern) requires valid #GMatchInfo object. | |
| 1464 | 1526 | func RegexCheckReplacement(ReplacementVar string, HasReferencesVar *bool) (bool, error) { | |
| 1527 | + | core.LazyRegister(&xRegexCheckReplacement, "GLIB", "g_regex_check_replacement", false) | |
| 1465 | 1528 | var cerr *Error | |
| 1466 | 1529 | ||
| 1467 | 1530 | cret := xRegexCheckReplacement(ReplacementVar, HasReferencesVar, &cerr) | |
| @@ -1479,6 +1542,8 @@ var xRegexEscapeNul func(string, int) string | |||
| 1479 | 1542 | // For completeness, @length can be -1 for a nul-terminated string. | |
| 1480 | 1543 | // In this case the output string will be of course equal to @string. | |
| 1481 | 1544 | func RegexEscapeNul(StringVar string, LengthVar int) string { | |
| 1545 | + | core.LazyRegister(&xRegexEscapeNul, "GLIB", "g_regex_escape_nul", false) | |
| 1546 | + | ||
| 1482 | 1547 | cret := xRegexEscapeNul(StringVar, LengthVar) | |
| 1483 | 1548 | return cret | |
| 1484 | 1549 | } | |
| @@ -1493,6 +1558,8 @@ var xRegexEscapeString func(string, int) string | |||
| 1493 | 1558 | // in this case remember to specify the correct length of @string | |
| 1494 | 1559 | // in @length. | |
| 1495 | 1560 | func RegexEscapeString(StringVar string, LengthVar int) string { | |
| 1561 | + | core.LazyRegister(&xRegexEscapeString, "GLIB", "g_regex_escape_string", false) | |
| 1562 | + | ||
| 1496 | 1563 | cret := xRegexEscapeString(StringVar, LengthVar) | |
| 1497 | 1564 | return cret | |
| 1498 | 1565 | } | |
| @@ -1510,6 +1577,8 @@ var xRegexMatchSimple func(string, string, RegexCompileFlags, RegexMatchFlags) b | |||
| 1510 | 1577 | // once, it's more efficient to compile the pattern once with | |
| 1511 | 1578 | // g_regex_new() and then use g_regex_match(). | |
| 1512 | 1579 | func RegexMatchSimple(PatternVar string, StringVar string, CompileOptionsVar RegexCompileFlags, MatchOptionsVar RegexMatchFlags) bool { | |
| 1580 | + | core.LazyRegister(&xRegexMatchSimple, "GLIB", "g_regex_match_simple", false) | |
| 1581 | + | ||
| 1513 | 1582 | cret := xRegexMatchSimple(PatternVar, StringVar, CompileOptionsVar, MatchOptionsVar) | |
| 1514 | 1583 | return cret | |
| 1515 | 1584 | } | |
| @@ -1544,6 +1613,8 @@ var xRegexSplitSimple func(string, string, RegexCompileFlags, RegexMatchFlags) [ | |||
| 1544 | 1613 | // characters. For example splitting "ab c" using as a separator | |
| 1545 | 1614 | // "\s*", you will get "a", "b" and "c". | |
| 1546 | 1615 | func RegexSplitSimple(PatternVar string, StringVar string, CompileOptionsVar RegexCompileFlags, MatchOptionsVar RegexMatchFlags) []string { | |
| 1616 | + | core.LazyRegister(&xRegexSplitSimple, "GLIB", "g_regex_split_simple", false) | |
| 1617 | + | ||
| 1547 | 1618 | cret := xRegexSplitSimple(PatternVar, StringVar, CompileOptionsVar, MatchOptionsVar) | |
| 1548 | 1619 | return cret | |
| 1549 | 1620 | } | |
| @@ -1551,60 +1622,4 @@ func RegexSplitSimple(PatternVar string, StringVar string, CompileOptionsVar Reg | |||
| 1551 | 1622 | func init() { | |
| 1552 | 1623 | core.SetPackageName("GLIB", "glib-2.0") | |
| 1553 | 1624 | core.SetSharedLibraries("GLIB", []string{"libgobject-2.0.so.0", "libglib-2.0.so.0", "libgobject-2.0.0.dylib", "libglib-2.0.0.dylib"}) | |
| 1554 | - | var libs []uintptr | |
| 1555 | - | for _, libPath := range core.GetPaths("GLIB") { | |
| 1556 | - | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 1557 | - | if err != nil { | |
| 1558 | - | panic(err) | |
| 1559 | - | } | |
| 1560 | - | libs = append(libs, lib) | |
| 1561 | - | } | |
| 1562 | - | ||
| 1563 | - | core.PuregoSafeRegister(&xRegexCheckReplacement, libs, "g_regex_check_replacement") | |
| 1564 | - | core.PuregoSafeRegister(&xRegexEscapeNul, libs, "g_regex_escape_nul") | |
| 1565 | - | core.PuregoSafeRegister(&xRegexEscapeString, libs, "g_regex_escape_string") | |
| 1566 | - | core.PuregoSafeRegister(&xRegexMatchSimple, libs, "g_regex_match_simple") | |
| 1567 | - | core.PuregoSafeRegister(&xRegexSplitSimple, libs, "g_regex_split_simple") | |
| 1568 | - | ||
| 1569 | - | core.PuregoSafeRegister(&xMatchInfoGLibType, libs, "g_match_info_get_type") | |
| 1570 | - | ||
| 1571 | - | core.PuregoSafeRegister(&xMatchInfoExpandReferences, libs, "g_match_info_expand_references") | |
| 1572 | - | core.PuregoSafeRegister(&xMatchInfoFetch, libs, "g_match_info_fetch") | |
| 1573 | - | core.PuregoSafeRegister(&xMatchInfoFetchAll, libs, "g_match_info_fetch_all") | |
| 1574 | - | core.PuregoSafeRegister(&xMatchInfoFetchNamed, libs, "g_match_info_fetch_named") | |
| 1575 | - | core.PuregoSafeRegister(&xMatchInfoFetchNamedPos, libs, "g_match_info_fetch_named_pos") | |
| 1576 | - | core.PuregoSafeRegister(&xMatchInfoFetchPos, libs, "g_match_info_fetch_pos") | |
| 1577 | - | core.PuregoSafeRegister(&xMatchInfoFree, libs, "g_match_info_free") | |
| 1578 | - | core.PuregoSafeRegister(&xMatchInfoGetMatchCount, libs, "g_match_info_get_match_count") | |
| 1579 | - | core.PuregoSafeRegister(&xMatchInfoGetRegex, libs, "g_match_info_get_regex") | |
| 1580 | - | core.PuregoSafeRegister(&xMatchInfoGetString, libs, "g_match_info_get_string") | |
| 1581 | - | core.PuregoSafeRegister(&xMatchInfoIsPartialMatch, libs, "g_match_info_is_partial_match") | |
| 1582 | - | core.PuregoSafeRegister(&xMatchInfoMatches, libs, "g_match_info_matches") | |
| 1583 | - | core.PuregoSafeRegister(&xMatchInfoNext, libs, "g_match_info_next") | |
| 1584 | - | core.PuregoSafeRegister(&xMatchInfoRef, libs, "g_match_info_ref") | |
| 1585 | - | core.PuregoSafeRegister(&xMatchInfoUnref, libs, "g_match_info_unref") | |
| 1586 | - | ||
| 1587 | - | core.PuregoSafeRegister(&xRegexGLibType, libs, "g_regex_get_type") | |
| 1588 | - | ||
| 1589 | - | core.PuregoSafeRegister(&xNewRegex, libs, "g_regex_new") | |
| 1590 | - | ||
| 1591 | - | core.PuregoSafeRegister(&xRegexGetCaptureCount, libs, "g_regex_get_capture_count") | |
| 1592 | - | core.PuregoSafeRegister(&xRegexGetCompileFlags, libs, "g_regex_get_compile_flags") | |
| 1593 | - | core.PuregoSafeRegister(&xRegexGetHasCrOrLf, libs, "g_regex_get_has_cr_or_lf") | |
| 1594 | - | core.PuregoSafeRegister(&xRegexGetMatchFlags, libs, "g_regex_get_match_flags") | |
| 1595 | - | core.PuregoSafeRegister(&xRegexGetMaxBackref, libs, "g_regex_get_max_backref") | |
| 1596 | - | core.PuregoSafeRegister(&xRegexGetMaxLookbehind, libs, "g_regex_get_max_lookbehind") | |
| 1597 | - | core.PuregoSafeRegister(&xRegexGetPattern, libs, "g_regex_get_pattern") | |
| 1598 | - | core.PuregoSafeRegister(&xRegexGetStringNumber, libs, "g_regex_get_string_number") | |
| 1599 | - | core.PuregoSafeRegister(&xRegexMatch, libs, "g_regex_match") | |
| 1600 | - | core.PuregoSafeRegister(&xRegexMatchAll, libs, "g_regex_match_all") | |
| 1601 | - | core.PuregoSafeRegister(&xRegexMatchAllFull, libs, "g_regex_match_all_full") | |
| 1602 | - | core.PuregoSafeRegister(&xRegexMatchFull, libs, "g_regex_match_full") | |
| 1603 | - | core.PuregoSafeRegister(&xRegexRef, libs, "g_regex_ref") | |
| 1604 | - | core.PuregoSafeRegister(&xRegexReplace, libs, "g_regex_replace") | |
| 1605 | - | core.PuregoSafeRegister(&xRegexReplaceEval, libs, "g_regex_replace_eval") | |
| 1606 | - | core.PuregoSafeRegister(&xRegexReplaceLiteral, libs, "g_regex_replace_literal") | |
| 1607 | - | core.PuregoSafeRegister(&xRegexSplit, libs, "g_regex_split") | |
| 1608 | - | core.PuregoSafeRegister(&xRegexSplitFull, libs, "g_regex_split_full") | |
| 1609 | - | core.PuregoSafeRegister(&xRegexUnref, libs, "g_regex_unref") | |
| 1610 | 1625 | } | |
| @@ -5,7 +5,6 @@ import ( | |||||
| 5 | "structs" | 5 | "structs" | ||
| 6 | "unsafe" | 6 | "unsafe" | ||
| 7 | 7 | ||||
| 8 | - | "github.com/bnema/purego" | |||
| 9 | "github.com/bnema/puregotk/pkg/core" | 8 | "github.com/bnema/puregotk/pkg/core" | ||
| 10 | "github.com/bnema/puregotk/v4/gobject/types" | 9 | "github.com/bnema/puregotk/v4/gobject/types" | ||
| 11 | ) | 10 | ) | ||
| @@ -25,6 +24,7 @@ type MatchInfo struct { | |||||
| 25 | var xMatchInfoGLibType func() types.GType | 24 | var xMatchInfoGLibType func() types.GType | ||
| 26 | 25 | ||||
| 27 | func MatchInfoGLibType() types.GType { | 26 | func MatchInfoGLibType() types.GType { | ||
| 27 | + | core.LazyRegister(&xMatchInfoGLibType, "GLIB", "g_match_info_get_type", false) | |||
| 28 | return xMatchInfoGLibType() | 28 | return xMatchInfoGLibType() | ||
| 29 | } | 29 | } | ||
| 30 | 30 | ||||
| @@ -60,6 +60,7 @@ var xMatchInfoExpandReferences func(uintptr, string, **Error) string | |||||
| 60 | // Use g_regex_check_replacement() to find out whether @string_to_expand | 60 | // Use g_regex_check_replacement() to find out whether @string_to_expand | ||
| 61 | // contains references. | 61 | // contains references. | ||
| 62 | func (x *MatchInfo) ExpandReferences(StringToExpandVar string) (string, error) { | 62 | func (x *MatchInfo) ExpandReferences(StringToExpandVar string) (string, error) { | ||
| 63 | + | core.LazyRegister(&xMatchInfoExpandReferences, "GLIB", "g_match_info_expand_references", false) | |||
| 63 | var cerr *Error | 64 | var cerr *Error | ||
| 64 | 65 | ||||
| 65 | cret := xMatchInfoExpandReferences(x.GoPointer(), StringToExpandVar, &cerr) | 66 | cret := xMatchInfoExpandReferences(x.GoPointer(), StringToExpandVar, &cerr) | ||
| @@ -88,6 +89,8 @@ var xMatchInfoFetch func(uintptr, int) string | |||||
| 88 | // The string is fetched from the string passed to the match function, | 89 | // The string is fetched from the string passed to the match function, | ||
| 89 | // so you cannot call this function after freeing the string. | 90 | // so you cannot call this function after freeing the string. | ||
| 90 | func (x *MatchInfo) Fetch(MatchNumVar int) string { | 91 | func (x *MatchInfo) Fetch(MatchNumVar int) string { | ||
| 92 | + | core.LazyRegister(&xMatchInfoFetch, "GLIB", "g_match_info_fetch", false) | |||
| 93 | + | ||||
| 91 | cret := xMatchInfoFetch(x.GoPointer(), MatchNumVar) | 94 | cret := xMatchInfoFetch(x.GoPointer(), MatchNumVar) | ||
| 92 | return cret | 95 | return cret | ||
| 93 | } | 96 | } | ||
| @@ -111,6 +114,8 @@ var xMatchInfoFetchAll func(uintptr) []string | |||||
| 111 | // The strings are fetched from the string passed to the match function, | 114 | // The strings are fetched from the string passed to the match function, | ||
| 112 | // so you cannot call this function after freeing the string. | 115 | // so you cannot call this function after freeing the string. | ||
| 113 | func (x *MatchInfo) FetchAll() []string { | 116 | func (x *MatchInfo) FetchAll() []string { | ||
| 117 | + | core.LazyRegister(&xMatchInfoFetchAll, "GLIB", "g_match_info_fetch_all", false) | |||
| 118 | + | ||||
| 114 | cret := xMatchInfoFetchAll(x.GoPointer()) | 119 | cret := xMatchInfoFetchAll(x.GoPointer()) | ||
| 115 | return cret | 120 | return cret | ||
| 116 | } | 121 | } | ||
| @@ -126,6 +131,8 @@ var xMatchInfoFetchNamed func(uintptr, string) string | |||||
| 126 | // The string is fetched from the string passed to the match function, | 131 | // The string is fetched from the string passed to the match function, | ||
| 127 | // so you cannot call this function after freeing the string. | 132 | // so you cannot call this function after freeing the string. | ||
| 128 | func (x *MatchInfo) FetchNamed(NameVar string) string { | 133 | func (x *MatchInfo) FetchNamed(NameVar string) string { | ||
| 134 | + | core.LazyRegister(&xMatchInfoFetchNamed, "GLIB", "g_match_info_fetch_named", false) | |||
| 135 | + | ||||
| 129 | cret := xMatchInfoFetchNamed(x.GoPointer(), NameVar) | 136 | cret := xMatchInfoFetchNamed(x.GoPointer(), NameVar) | ||
| 130 | return cret | 137 | return cret | ||
| 131 | } | 138 | } | ||
| @@ -141,6 +148,8 @@ var xMatchInfoFetchNamedPos func(uintptr, string, *int, *int) bool | |||||
| 141 | // As @end_pos is set to the byte after the final byte of the match (on success), | 148 | // As @end_pos is set to the byte after the final byte of the match (on success), | ||
| 142 | // the length of the match can be calculated as `end_pos - start_pos`. | 149 | // the length of the match can be calculated as `end_pos - start_pos`. | ||
| 143 | func (x *MatchInfo) FetchNamedPos(NameVar string, StartPosVar *int, EndPosVar *int) bool { | 150 | func (x *MatchInfo) FetchNamedPos(NameVar string, StartPosVar *int, EndPosVar *int) bool { | ||
| 151 | + | core.LazyRegister(&xMatchInfoFetchNamedPos, "GLIB", "g_match_info_fetch_named_pos", false) | |||
| 152 | + | ||||
| 144 | cret := xMatchInfoFetchNamedPos(x.GoPointer(), NameVar, StartPosVar, EndPosVar) | 153 | cret := xMatchInfoFetchNamedPos(x.GoPointer(), NameVar, StartPosVar, EndPosVar) | ||
| 145 | return cret | 154 | return cret | ||
| 146 | } | 155 | } | ||
| @@ -355,6 +364,8 @@ var xMatchInfoFetchPos func(uintptr, int, *int, *int) bool | |||||
| 355 | // 3 N/A 0 2147483647 2147483647 | 364 | // 3 N/A 0 2147483647 2147483647 | ||
| 356 | // ``` | 365 | // ``` | ||
| 357 | func (x *MatchInfo) FetchPos(MatchNumVar int, StartPosVar *int, EndPosVar *int) bool { | 366 | func (x *MatchInfo) FetchPos(MatchNumVar int, StartPosVar *int, EndPosVar *int) bool { | ||
| 367 | + | core.LazyRegister(&xMatchInfoFetchPos, "GLIB", "g_match_info_fetch_pos", false) | |||
| 368 | + | ||||
| 358 | cret := xMatchInfoFetchPos(x.GoPointer(), MatchNumVar, StartPosVar, EndPosVar) | 369 | cret := xMatchInfoFetchPos(x.GoPointer(), MatchNumVar, StartPosVar, EndPosVar) | ||
| 359 | return cret | 370 | return cret | ||
| 360 | } | 371 | } | ||
| @@ -364,6 +375,8 @@ var xMatchInfoFree func(uintptr) | |||||
| 364 | // If @match_info is not %NULL, calls g_match_info_unref(); otherwise does | 375 | // If @match_info is not %NULL, calls g_match_info_unref(); otherwise does | ||
| 365 | // nothing. | 376 | // nothing. | ||
| 366 | func (x *MatchInfo) Free() { | 377 | func (x *MatchInfo) Free() { | ||
| 378 | + | core.LazyRegister(&xMatchInfoFree, "GLIB", "g_match_info_free", false) | |||
| 379 | + | ||||
| 367 | xMatchInfoFree(x.GoPointer()) | 380 | xMatchInfoFree(x.GoPointer()) | ||
| 368 | } | 381 | } | ||
| 369 | 382 | ||||
| @@ -378,6 +391,8 @@ var xMatchInfoGetMatchCount func(uintptr) int | |||||
| 378 | // count is not that of the number of capturing parentheses but that of | 391 | // count is not that of the number of capturing parentheses but that of | ||
| 379 | // the number of matched substrings. | 392 | // the number of matched substrings. | ||
| 380 | func (x *MatchInfo) GetMatchCount() int { | 393 | func (x *MatchInfo) GetMatchCount() int { | ||
| 394 | + | core.LazyRegister(&xMatchInfoGetMatchCount, "GLIB", "g_match_info_get_match_count", false) | |||
| 395 | + | ||||
| 381 | cret := xMatchInfoGetMatchCount(x.GoPointer()) | 396 | cret := xMatchInfoGetMatchCount(x.GoPointer()) | ||
| 382 | return cret | 397 | return cret | ||
| 383 | } | 398 | } | ||
| @@ -388,6 +403,8 @@ var xMatchInfoGetRegex func(uintptr) uintptr | |||||
| 388 | // and must not be freed. Use g_regex_ref() if you need to keep it | 403 | // and must not be freed. Use g_regex_ref() if you need to keep it | ||
| 389 | // after you free @match_info object. | 404 | // after you free @match_info object. | ||
| 390 | func (x *MatchInfo) GetRegex() *Regex { | 405 | func (x *MatchInfo) GetRegex() *Regex { | ||
| 406 | + | core.LazyRegister(&xMatchInfoGetRegex, "GLIB", "g_match_info_get_regex", false) | |||
| 407 | + | ||||
| 391 | cret := xMatchInfoGetRegex(x.GoPointer()) | 408 | cret := xMatchInfoGetRegex(x.GoPointer()) | ||
| 392 | if cret == 0 { | 409 | if cret == 0 { | ||
| 393 | return nil | 410 | return nil | ||
| @@ -401,6 +418,8 @@ var xMatchInfoGetString func(uintptr) string | |||||
| 401 | // string passed to g_regex_match() or g_regex_replace() so | 418 | // string passed to g_regex_match() or g_regex_replace() so | ||
| 402 | // you may not free it before calling this function. | 419 | // you may not free it before calling this function. | ||
| 403 | func (x *MatchInfo) GetString() string { | 420 | func (x *MatchInfo) GetString() string { | ||
| 421 | + | core.LazyRegister(&xMatchInfoGetString, "GLIB", "g_match_info_get_string", false) | |||
| 422 | + | ||||
| 404 | cret := xMatchInfoGetString(x.GoPointer()) | 423 | cret := xMatchInfoGetString(x.GoPointer()) | ||
| 405 | return cret | 424 | return cret | ||
| 406 | } | 425 | } | ||
| @@ -441,6 +460,8 @@ var xMatchInfoIsPartialMatch func(uintptr) bool | |||||
| 441 | // | 460 | // | ||
| 442 | // See pcrepartial(3) for more information on partial matching. | 461 | // See pcrepartial(3) for more information on partial matching. | ||
| 443 | func (x *MatchInfo) IsPartialMatch() bool { | 462 | func (x *MatchInfo) IsPartialMatch() bool { | ||
| 463 | + | core.LazyRegister(&xMatchInfoIsPartialMatch, "GLIB", "g_match_info_is_partial_match", false) | |||
| 464 | + | ||||
| 444 | cret := xMatchInfoIsPartialMatch(x.GoPointer()) | 465 | cret := xMatchInfoIsPartialMatch(x.GoPointer()) | ||
| 445 | return cret | 466 | return cret | ||
| 446 | } | 467 | } | ||
| @@ -449,6 +470,8 @@ var xMatchInfoMatches func(uintptr) bool | |||||
| 449 | 470 | ||||
| 450 | // Returns whether the previous match operation succeeded. | 471 | // Returns whether the previous match operation succeeded. | ||
| 451 | func (x *MatchInfo) Matches() bool { | 472 | func (x *MatchInfo) Matches() bool { | ||
| 473 | + | core.LazyRegister(&xMatchInfoMatches, "GLIB", "g_match_info_matches", false) | |||
| 474 | + | ||||
| 452 | cret := xMatchInfoMatches(x.GoPointer()) | 475 | cret := xMatchInfoMatches(x.GoPointer()) | ||
| 453 | return cret | 476 | return cret | ||
| 454 | } | 477 | } | ||
| @@ -462,6 +485,7 @@ var xMatchInfoNext func(uintptr, **Error) bool | |||||
| 462 | // The match is done on the string passed to the match function, so you | 485 | // The match is done on the string passed to the match function, so you | ||
| 463 | // cannot free it before calling this function. | 486 | // cannot free it before calling this function. | ||
| 464 | func (x *MatchInfo) Next() (bool, error) { | 487 | func (x *MatchInfo) Next() (bool, error) { | ||
| 488 | + | core.LazyRegister(&xMatchInfoNext, "GLIB", "g_match_info_next", false) | |||
| 465 | var cerr *Error | 489 | var cerr *Error | ||
| 466 | 490 | ||||
| 467 | cret := xMatchInfoNext(x.GoPointer(), &cerr) | 491 | cret := xMatchInfoNext(x.GoPointer(), &cerr) | ||
| @@ -475,6 +499,8 @@ var xMatchInfoRef func(uintptr) uintptr | |||||
| 475 | 499 | ||||
| 476 | // Increases reference count of @match_info by 1. | 500 | // Increases reference count of @match_info by 1. | ||
| 477 | func (x *MatchInfo) Ref() *MatchInfo { | 501 | func (x *MatchInfo) Ref() *MatchInfo { | ||
| 502 | + | core.LazyRegister(&xMatchInfoRef, "GLIB", "g_match_info_ref", false) | |||
| 503 | + | ||||
| 478 | cret := xMatchInfoRef(x.GoPointer()) | 504 | cret := xMatchInfoRef(x.GoPointer()) | ||
| 479 | if cret == 0 { | 505 | if cret == 0 { | ||
| 480 | return nil | 506 | return nil | ||
| @@ -487,6 +513,8 @@ var xMatchInfoUnref func(uintptr) | |||||
| 487 | // Decreases reference count of @match_info by 1. When reference count drops | 513 | // Decreases reference count of @match_info by 1. When reference count drops | ||
| 488 | // to zero, it frees all the memory associated with the match_info structure. | 514 | // to zero, it frees all the memory associated with the match_info structure. | ||
| 489 | func (x *MatchInfo) Unref() { | 515 | func (x *MatchInfo) Unref() { | ||
| 516 | + | core.LazyRegister(&xMatchInfoUnref, "GLIB", "g_match_info_unref", false) | |||
| 517 | + | ||||
| 490 | xMatchInfoUnref(x.GoPointer()) | 518 | xMatchInfoUnref(x.GoPointer()) | ||
| 491 | } | 519 | } | ||
| 492 | 520 | ||||
| @@ -633,6 +661,7 @@ type Regex struct { | |||||
| 633 | var xRegexGLibType func() types.GType | 661 | var xRegexGLibType func() types.GType | ||
| 634 | 662 | ||||
| 635 | func RegexGLibType() types.GType { | 663 | func RegexGLibType() types.GType { | ||
| 664 | + | core.LazyRegister(&xRegexGLibType, "GLIB", "g_regex_get_type", false) | |||
| 636 | return xRegexGLibType() | 665 | return xRegexGLibType() | ||
| 637 | } | 666 | } | ||
| 638 | 667 | ||||
| @@ -653,6 +682,7 @@ var xNewRegex func(string, RegexCompileFlags, RegexMatchFlags, **Error) uintptr | |||||
| 653 | // Compiles the regular expression to an internal form, and does | 682 | // Compiles the regular expression to an internal form, and does | ||
| 654 | // the initial setup of the #GRegex structure. | 683 | // the initial setup of the #GRegex structure. | ||
| 655 | func NewRegex(PatternVar string, CompileOptionsVar RegexCompileFlags, MatchOptionsVar RegexMatchFlags) (*Regex, error) { | 684 | func NewRegex(PatternVar string, CompileOptionsVar RegexCompileFlags, MatchOptionsVar RegexMatchFlags) (*Regex, error) { | ||
| 685 | + | core.LazyRegister(&xNewRegex, "GLIB", "g_regex_new", false) | |||
| 656 | var cerr *Error | 686 | var cerr *Error | ||
| 657 | 687 | ||||
| 658 | cret := xNewRegex(PatternVar, CompileOptionsVar, MatchOptionsVar, &cerr) | 688 | cret := xNewRegex(PatternVar, CompileOptionsVar, MatchOptionsVar, &cerr) | ||
| @@ -669,6 +699,8 @@ var xRegexGetCaptureCount func(uintptr) int | |||||
| 669 | 699 | ||||
| 670 | // Returns the number of capturing subpatterns in the pattern. | 700 | // Returns the number of capturing subpatterns in the pattern. | ||
| 671 | func (x *Regex) GetCaptureCount() int { | 701 | func (x *Regex) GetCaptureCount() int { | ||
| 702 | + | core.LazyRegister(&xRegexGetCaptureCount, "GLIB", "g_regex_get_capture_count", false) | |||
| 703 | + | ||||
| 672 | cret := xRegexGetCaptureCount(x.GoPointer()) | 704 | cret := xRegexGetCaptureCount(x.GoPointer()) | ||
| 673 | return cret | 705 | return cret | ||
| 674 | } | 706 | } | ||
| @@ -681,6 +713,8 @@ var xRegexGetCompileFlags func(uintptr) RegexCompileFlags | |||||
| 681 | // include flags set by option expressions such as `(?i)` found at the | 713 | // include flags set by option expressions such as `(?i)` found at the | ||
| 682 | // top-level within the compiled pattern. | 714 | // top-level within the compiled pattern. | ||
| 683 | func (x *Regex) GetCompileFlags() RegexCompileFlags { | 715 | func (x *Regex) GetCompileFlags() RegexCompileFlags { | ||
| 716 | + | core.LazyRegister(&xRegexGetCompileFlags, "GLIB", "g_regex_get_compile_flags", false) | |||
| 717 | + | ||||
| 684 | cret := xRegexGetCompileFlags(x.GoPointer()) | 718 | cret := xRegexGetCompileFlags(x.GoPointer()) | ||
| 685 | return cret | 719 | return cret | ||
| 686 | } | 720 | } | ||
| @@ -689,6 +723,8 @@ var xRegexGetHasCrOrLf func(uintptr) bool | |||||
| 689 | 723 | ||||
| 690 | // Checks whether the pattern contains explicit CR or LF references. | 724 | // Checks whether the pattern contains explicit CR or LF references. | ||
| 691 | func (x *Regex) GetHasCrOrLf() bool { | 725 | func (x *Regex) GetHasCrOrLf() bool { | ||
| 726 | + | core.LazyRegister(&xRegexGetHasCrOrLf, "GLIB", "g_regex_get_has_cr_or_lf", false) | |||
| 727 | + | ||||
| 692 | cret := xRegexGetHasCrOrLf(x.GoPointer()) | 728 | cret := xRegexGetHasCrOrLf(x.GoPointer()) | ||
| 693 | return cret | 729 | return cret | ||
| 694 | } | 730 | } | ||
| @@ -697,6 +733,8 @@ var xRegexGetMatchFlags func(uintptr) RegexMatchFlags | |||||
| 697 | 733 | ||||
| 698 | // Returns the match options that @regex was created with. | 734 | // Returns the match options that @regex was created with. | ||
| 699 | func (x *Regex) GetMatchFlags() RegexMatchFlags { | 735 | func (x *Regex) GetMatchFlags() RegexMatchFlags { | ||
| 736 | + | core.LazyRegister(&xRegexGetMatchFlags, "GLIB", "g_regex_get_match_flags", false) | |||
| 737 | + | ||||
| 700 | cret := xRegexGetMatchFlags(x.GoPointer()) | 738 | cret := xRegexGetMatchFlags(x.GoPointer()) | ||
| 701 | return cret | 739 | return cret | ||
| 702 | } | 740 | } | ||
| @@ -707,6 +745,8 @@ var xRegexGetMaxBackref func(uintptr) int | |||||
| 707 | // in the pattern, or 0 if the pattern does not contain | 745 | // in the pattern, or 0 if the pattern does not contain | ||
| 708 | // back references. | 746 | // back references. | ||
| 709 | func (x *Regex) GetMaxBackref() int { | 747 | func (x *Regex) GetMaxBackref() int { | ||
| 748 | + | core.LazyRegister(&xRegexGetMaxBackref, "GLIB", "g_regex_get_max_backref", false) | |||
| 749 | + | ||||
| 710 | cret := xRegexGetMaxBackref(x.GoPointer()) | 750 | cret := xRegexGetMaxBackref(x.GoPointer()) | ||
| 711 | return cret | 751 | return cret | ||
| 712 | } | 752 | } | ||
| @@ -717,6 +757,8 @@ var xRegexGetMaxLookbehind func(uintptr) int | |||||
| 717 | // pattern. This information is useful when doing multi-segment matching using | 757 | // pattern. This information is useful when doing multi-segment matching using | ||
| 718 | // the partial matching facilities. | 758 | // the partial matching facilities. | ||
| 719 | func (x *Regex) GetMaxLookbehind() int { | 759 | func (x *Regex) GetMaxLookbehind() int { | ||
| 760 | + | core.LazyRegister(&xRegexGetMaxLookbehind, "GLIB", "g_regex_get_max_lookbehind", false) | |||
| 761 | + | ||||
| 720 | cret := xRegexGetMaxLookbehind(x.GoPointer()) | 762 | cret := xRegexGetMaxLookbehind(x.GoPointer()) | ||
| 721 | return cret | 763 | return cret | ||
| 722 | } | 764 | } | ||
| @@ -726,6 +768,8 @@ var xRegexGetPattern func(uintptr) string | |||||
| 726 | // Gets the pattern string associated with @regex, i.e. a copy of | 768 | // Gets the pattern string associated with @regex, i.e. a copy of | ||
| 727 | // the string passed to g_regex_new(). | 769 | // the string passed to g_regex_new(). | ||
| 728 | func (x *Regex) GetPattern() string { | 770 | func (x *Regex) GetPattern() string { | ||
| 771 | + | core.LazyRegister(&xRegexGetPattern, "GLIB", "g_regex_get_pattern", false) | |||
| 772 | + | ||||
| 729 | cret := xRegexGetPattern(x.GoPointer()) | 773 | cret := xRegexGetPattern(x.GoPointer()) | ||
| 730 | return cret | 774 | return cret | ||
| 731 | } | 775 | } | ||
| @@ -734,6 +778,8 @@ var xRegexGetStringNumber func(uintptr, string) int | |||||
| 734 | 778 | ||||
| 735 | // Retrieves the number of the subexpression named @name. | 779 | // Retrieves the number of the subexpression named @name. | ||
| 736 | func (x *Regex) GetStringNumber(NameVar string) int { | 780 | func (x *Regex) GetStringNumber(NameVar string) int { | ||
| 781 | + | core.LazyRegister(&xRegexGetStringNumber, "GLIB", "g_regex_get_string_number", false) | |||
| 782 | + | ||||
| 737 | cret := xRegexGetStringNumber(x.GoPointer(), NameVar) | 783 | cret := xRegexGetStringNumber(x.GoPointer(), NameVar) | ||
| 738 | return cret | 784 | return cret | ||
| 739 | } | 785 | } | ||
| @@ -783,6 +829,8 @@ var xRegexMatch func(uintptr, string, RegexMatchFlags, **MatchInfo) bool | |||||
| 783 | // you use any #GMatchInfo method (except g_match_info_free()) after | 829 | // you use any #GMatchInfo method (except g_match_info_free()) after | ||
| 784 | // freeing or modifying @string then the behaviour is undefined. | 830 | // freeing or modifying @string then the behaviour is undefined. | ||
| 785 | func (x *Regex) Match(StringVar string, MatchOptionsVar RegexMatchFlags, MatchInfoVar **MatchInfo) bool { | 831 | func (x *Regex) Match(StringVar string, MatchOptionsVar RegexMatchFlags, MatchInfoVar **MatchInfo) bool { | ||
| 832 | + | core.LazyRegister(&xRegexMatch, "GLIB", "g_regex_match", false) | |||
| 833 | + | ||||
| 786 | cret := xRegexMatch(x.GoPointer(), StringVar, MatchOptionsVar, MatchInfoVar) | 834 | cret := xRegexMatch(x.GoPointer(), StringVar, MatchOptionsVar, MatchInfoVar) | ||
| 787 | return cret | 835 | return cret | ||
| 788 | } | 836 | } | ||
| @@ -804,6 +852,8 @@ var xRegexMatchAll func(uintptr, string, RegexMatchFlags, **MatchInfo) bool | |||||
| 804 | // you use any #GMatchInfo method (except g_match_info_free()) after | 852 | // you use any #GMatchInfo method (except g_match_info_free()) after | ||
| 805 | // freeing or modifying @string then the behaviour is undefined. | 853 | // freeing or modifying @string then the behaviour is undefined. | ||
| 806 | func (x *Regex) MatchAll(StringVar string, MatchOptionsVar RegexMatchFlags, MatchInfoVar **MatchInfo) bool { | 854 | func (x *Regex) MatchAll(StringVar string, MatchOptionsVar RegexMatchFlags, MatchInfoVar **MatchInfo) bool { | ||
| 855 | + | core.LazyRegister(&xRegexMatchAll, "GLIB", "g_regex_match_all", false) | |||
| 856 | + | ||||
| 807 | cret := xRegexMatchAll(x.GoPointer(), StringVar, MatchOptionsVar, MatchInfoVar) | 857 | cret := xRegexMatchAll(x.GoPointer(), StringVar, MatchOptionsVar, MatchInfoVar) | ||
| 808 | return cret | 858 | return cret | ||
| 809 | } | 859 | } | ||
| @@ -849,6 +899,7 @@ var xRegexMatchAllFull func(uintptr, []string, int, int, RegexMatchFlags, **Matc | |||||
| 849 | // you use any #GMatchInfo method (except g_match_info_free()) after | 899 | // you use any #GMatchInfo method (except g_match_info_free()) after | ||
| 850 | // freeing or modifying @string then the behaviour is undefined. | 900 | // freeing or modifying @string then the behaviour is undefined. | ||
| 851 | func (x *Regex) MatchAllFull(StringVar []string, StringLenVar int, StartPositionVar int, MatchOptionsVar RegexMatchFlags, MatchInfoVar **MatchInfo) (bool, error) { | 901 | func (x *Regex) MatchAllFull(StringVar []string, StringLenVar int, StartPositionVar int, MatchOptionsVar RegexMatchFlags, MatchInfoVar **MatchInfo) (bool, error) { | ||
| 902 | + | core.LazyRegister(&xRegexMatchAllFull, "GLIB", "g_regex_match_all_full", false) | |||
| 852 | var cerr *Error | 903 | var cerr *Error | ||
| 853 | 904 | ||||
| 854 | cret := xRegexMatchAllFull(x.GoPointer(), StringVar, StringLenVar, StartPositionVar, MatchOptionsVar, MatchInfoVar, &cerr) | 905 | cret := xRegexMatchAllFull(x.GoPointer(), StringVar, StringLenVar, StartPositionVar, MatchOptionsVar, MatchInfoVar, &cerr) | ||
| @@ -914,6 +965,7 @@ var xRegexMatchFull func(uintptr, []string, int, int, RegexMatchFlags, **MatchIn | |||||
| 914 | // | 965 | // | ||
| 915 | // ]| | 966 | // ]| | ||
| 916 | func (x *Regex) MatchFull(StringVar []string, StringLenVar int, StartPositionVar int, MatchOptionsVar RegexMatchFlags, MatchInfoVar **MatchInfo) (bool, error) { | 967 | func (x *Regex) MatchFull(StringVar []string, StringLenVar int, StartPositionVar int, MatchOptionsVar RegexMatchFlags, MatchInfoVar **MatchInfo) (bool, error) { | ||
| 968 | + | core.LazyRegister(&xRegexMatchFull, "GLIB", "g_regex_match_full", false) | |||
| 917 | var cerr *Error | 969 | var cerr *Error | ||
| 918 | 970 | ||||
| 919 | cret := xRegexMatchFull(x.GoPointer(), StringVar, StringLenVar, StartPositionVar, MatchOptionsVar, MatchInfoVar, &cerr) | 971 | cret := xRegexMatchFull(x.GoPointer(), StringVar, StringLenVar, StartPositionVar, MatchOptionsVar, MatchInfoVar, &cerr) | ||
| @@ -927,6 +979,8 @@ var xRegexRef func(uintptr) uintptr | |||||
| 927 | 979 | ||||
| 928 | // Increases reference count of @regex by 1. | 980 | // Increases reference count of @regex by 1. | ||
| 929 | func (x *Regex) Ref() *Regex { | 981 | func (x *Regex) Ref() *Regex { | ||
| 982 | + | core.LazyRegister(&xRegexRef, "GLIB", "g_regex_ref", false) | |||
| 983 | + | ||||
| 930 | cret := xRegexRef(x.GoPointer()) | 984 | cret := xRegexRef(x.GoPointer()) | ||
| 931 | if cret == 0 { | 985 | if cret == 0 { | ||
| 932 | return nil | 986 | return nil | ||
| @@ -963,6 +1017,7 @@ var xRegexReplace func(uintptr, []string, int, int, string, RegexMatchFlags, **E | |||||
| 963 | // string and setting %G_REGEX_MATCH_NOTBOL in the case of a pattern that | 1017 | // string and setting %G_REGEX_MATCH_NOTBOL in the case of a pattern that | ||
| 964 | // begins with any kind of lookbehind assertion, such as "\b". | 1018 | // begins with any kind of lookbehind assertion, such as "\b". | ||
| 965 | func (x *Regex) Replace(StringVar []string, StringLenVar int, StartPositionVar int, ReplacementVar string, MatchOptionsVar RegexMatchFlags) (string, error) { | 1019 | func (x *Regex) Replace(StringVar []string, StringLenVar int, StartPositionVar int, ReplacementVar string, MatchOptionsVar RegexMatchFlags) (string, error) { | ||
| 1020 | + | core.LazyRegister(&xRegexReplace, "GLIB", "g_regex_replace", false) | |||
| 966 | var cerr *Error | 1021 | var cerr *Error | ||
| 967 | 1022 | ||||
| 968 | cret := xRegexReplace(x.GoPointer(), StringVar, StringLenVar, StartPositionVar, ReplacementVar, MatchOptionsVar, &cerr) | 1023 | cret := xRegexReplace(x.GoPointer(), StringVar, StringLenVar, StartPositionVar, ReplacementVar, MatchOptionsVar, &cerr) | ||
| @@ -1022,6 +1077,7 @@ var xRegexReplaceEval func(uintptr, []string, int, int, RegexMatchFlags, uintptr | |||||
| 1022 | // ... | 1077 | // ... | ||
| 1023 | // ]| | 1078 | // ]| | ||
| 1024 | func (x *Regex) ReplaceEval(StringVar []string, StringLenVar int, StartPositionVar int, MatchOptionsVar RegexMatchFlags, EvalVar *RegexEvalCallback, UserDataVar uintptr) (string, error) { | 1079 | func (x *Regex) ReplaceEval(StringVar []string, StringLenVar int, StartPositionVar int, MatchOptionsVar RegexMatchFlags, EvalVar *RegexEvalCallback, UserDataVar uintptr) (string, error) { | ||
| 1080 | + | core.LazyRegister(&xRegexReplaceEval, "GLIB", "g_regex_replace_eval", false) | |||
| 1025 | var cerr *Error | 1081 | var cerr *Error | ||
| 1026 | 1082 | ||||
| 1027 | cret := xRegexReplaceEval(x.GoPointer(), StringVar, StringLenVar, StartPositionVar, MatchOptionsVar, NewCallback(EvalVar), UserDataVar, &cerr) | 1083 | cret := xRegexReplaceEval(x.GoPointer(), StringVar, StringLenVar, StartPositionVar, MatchOptionsVar, NewCallback(EvalVar), UserDataVar, &cerr) | ||
| @@ -1042,6 +1098,7 @@ var xRegexReplaceLiteral func(uintptr, []string, int, int, string, RegexMatchFla | |||||
| 1042 | // case of a pattern that begins with any kind of lookbehind | 1098 | // case of a pattern that begins with any kind of lookbehind | ||
| 1043 | // assertion, such as "\b". | 1099 | // assertion, such as "\b". | ||
| 1044 | func (x *Regex) ReplaceLiteral(StringVar []string, StringLenVar int, StartPositionVar int, ReplacementVar string, MatchOptionsVar RegexMatchFlags) (string, error) { | 1100 | func (x *Regex) ReplaceLiteral(StringVar []string, StringLenVar int, StartPositionVar int, ReplacementVar string, MatchOptionsVar RegexMatchFlags) (string, error) { | ||
| 1101 | + | core.LazyRegister(&xRegexReplaceLiteral, "GLIB", "g_regex_replace_literal", false) | |||
| 1045 | var cerr *Error | 1102 | var cerr *Error | ||
| 1046 | 1103 | ||||
| 1047 | cret := xRegexReplaceLiteral(x.GoPointer(), StringVar, StringLenVar, StartPositionVar, ReplacementVar, MatchOptionsVar, &cerr) | 1104 | cret := xRegexReplaceLiteral(x.GoPointer(), StringVar, StringLenVar, StartPositionVar, ReplacementVar, MatchOptionsVar, &cerr) | ||
| @@ -1071,6 +1128,8 @@ var xRegexSplit func(uintptr, string, RegexMatchFlags) []string | |||||
| 1071 | // For example splitting "ab c" using as a separator "\s*", you will get | 1128 | // For example splitting "ab c" using as a separator "\s*", you will get | ||
| 1072 | // "a", "b" and "c". | 1129 | // "a", "b" and "c". | ||
| 1073 | func (x *Regex) Split(StringVar string, MatchOptionsVar RegexMatchFlags) []string { | 1130 | func (x *Regex) Split(StringVar string, MatchOptionsVar RegexMatchFlags) []string { | ||
| 1131 | + | core.LazyRegister(&xRegexSplit, "GLIB", "g_regex_split", false) | |||
| 1132 | + | ||||
| 1074 | cret := xRegexSplit(x.GoPointer(), StringVar, MatchOptionsVar) | 1133 | cret := xRegexSplit(x.GoPointer(), StringVar, MatchOptionsVar) | ||
| 1075 | return cret | 1134 | return cret | ||
| 1076 | } | 1135 | } | ||
| @@ -1099,6 +1158,7 @@ var xRegexSplitFull func(uintptr, []string, int, int, RegexMatchFlags, int, **Er | |||||
| 1099 | // string and setting %G_REGEX_MATCH_NOTBOL in the case of a pattern | 1158 | // string and setting %G_REGEX_MATCH_NOTBOL in the case of a pattern | ||
| 1100 | // that begins with any kind of lookbehind assertion, such as "\b". | 1159 | // that begins with any kind of lookbehind assertion, such as "\b". | ||
| 1101 | func (x *Regex) SplitFull(StringVar []string, StringLenVar int, StartPositionVar int, MatchOptionsVar RegexMatchFlags, MaxTokensVar int) ([]string, error) { | 1160 | func (x *Regex) SplitFull(StringVar []string, StringLenVar int, StartPositionVar int, MatchOptionsVar RegexMatchFlags, MaxTokensVar int) ([]string, error) { | ||
| 1161 | + | core.LazyRegister(&xRegexSplitFull, "GLIB", "g_regex_split_full", false) | |||
| 1102 | var cerr *Error | 1162 | var cerr *Error | ||
| 1103 | 1163 | ||||
| 1104 | cret := xRegexSplitFull(x.GoPointer(), StringVar, StringLenVar, StartPositionVar, MatchOptionsVar, MaxTokensVar, &cerr) | 1164 | cret := xRegexSplitFull(x.GoPointer(), StringVar, StringLenVar, StartPositionVar, MatchOptionsVar, MaxTokensVar, &cerr) | ||
| @@ -1113,6 +1173,8 @@ var xRegexUnref func(uintptr) | |||||
| 1113 | // Decreases reference count of @regex by 1. When reference count drops | 1173 | // Decreases reference count of @regex by 1. When reference count drops | ||
| 1114 | // to zero, it frees all the memory associated with the regex structure. | 1174 | // to zero, it frees all the memory associated with the regex structure. | ||
| 1115 | func (x *Regex) Unref() { | 1175 | func (x *Regex) Unref() { | ||
| 1176 | + | core.LazyRegister(&xRegexUnref, "GLIB", "g_regex_unref", false) | |||
| 1177 | + | ||||
| 1116 | xRegexUnref(x.GoPointer()) | 1178 | xRegexUnref(x.GoPointer()) | ||
| 1117 | } | 1179 | } | ||
| 1118 | 1180 | ||||
| @@ -1462,6 +1524,7 @@ var xRegexCheckReplacement func(string, *bool, **Error) bool | |||||
| 1462 | // about actual match, but '\0\1' (whole match followed by first | 1524 | // about actual match, but '\0\1' (whole match followed by first | ||
| 1463 | // subpattern) requires valid #GMatchInfo object. | 1525 | // subpattern) requires valid #GMatchInfo object. | ||
| 1464 | func RegexCheckReplacement(ReplacementVar string, HasReferencesVar *bool) (bool, error) { | 1526 | func RegexCheckReplacement(ReplacementVar string, HasReferencesVar *bool) (bool, error) { | ||
| 1527 | + | core.LazyRegister(&xRegexCheckReplacement, "GLIB", "g_regex_check_replacement", false) | |||
| 1465 | var cerr *Error | 1528 | var cerr *Error | ||
| 1466 | 1529 | ||||
| 1467 | cret := xRegexCheckReplacement(ReplacementVar, HasReferencesVar, &cerr) | 1530 | cret := xRegexCheckReplacement(ReplacementVar, HasReferencesVar, &cerr) | ||
| @@ -1479,6 +1542,8 @@ var xRegexEscapeNul func(string, int) string | |||||
| 1479 | // For completeness, @length can be -1 for a nul-terminated string. | 1542 | // For completeness, @length can be -1 for a nul-terminated string. | ||
| 1480 | // In this case the output string will be of course equal to @string. | 1543 | // In this case the output string will be of course equal to @string. | ||
| 1481 | func RegexEscapeNul(StringVar string, LengthVar int) string { | 1544 | func RegexEscapeNul(StringVar string, LengthVar int) string { | ||
| 1545 | + | core.LazyRegister(&xRegexEscapeNul, "GLIB", "g_regex_escape_nul", false) | |||
| 1546 | + | ||||
| 1482 | cret := xRegexEscapeNul(StringVar, LengthVar) | 1547 | cret := xRegexEscapeNul(StringVar, LengthVar) | ||
| 1483 | return cret | 1548 | return cret | ||
| 1484 | } | 1549 | } | ||
| @@ -1493,6 +1558,8 @@ var xRegexEscapeString func(string, int) string | |||||
| 1493 | // in this case remember to specify the correct length of @string | 1558 | // in this case remember to specify the correct length of @string | ||
| 1494 | // in @length. | 1559 | // in @length. | ||
| 1495 | func RegexEscapeString(StringVar string, LengthVar int) string { | 1560 | func RegexEscapeString(StringVar string, LengthVar int) string { | ||
| 1561 | + | core.LazyRegister(&xRegexEscapeString, "GLIB", "g_regex_escape_string", false) | |||
| 1562 | + | ||||
| 1496 | cret := xRegexEscapeString(StringVar, LengthVar) | 1563 | cret := xRegexEscapeString(StringVar, LengthVar) | ||
| 1497 | return cret | 1564 | return cret | ||
| 1498 | } | 1565 | } | ||
| @@ -1510,6 +1577,8 @@ var xRegexMatchSimple func(string, string, RegexCompileFlags, RegexMatchFlags) b | |||||
| 1510 | // once, it's more efficient to compile the pattern once with | 1577 | // once, it's more efficient to compile the pattern once with | ||
| 1511 | // g_regex_new() and then use g_regex_match(). | 1578 | // g_regex_new() and then use g_regex_match(). | ||
| 1512 | func RegexMatchSimple(PatternVar string, StringVar string, CompileOptionsVar RegexCompileFlags, MatchOptionsVar RegexMatchFlags) bool { | 1579 | func RegexMatchSimple(PatternVar string, StringVar string, CompileOptionsVar RegexCompileFlags, MatchOptionsVar RegexMatchFlags) bool { | ||
| 1580 | + | core.LazyRegister(&xRegexMatchSimple, "GLIB", "g_regex_match_simple", false) | |||
| 1581 | + | ||||
| 1513 | cret := xRegexMatchSimple(PatternVar, StringVar, CompileOptionsVar, MatchOptionsVar) | 1582 | cret := xRegexMatchSimple(PatternVar, StringVar, CompileOptionsVar, MatchOptionsVar) | ||
| 1514 | return cret | 1583 | return cret | ||
| 1515 | } | 1584 | } | ||
| @@ -1544,6 +1613,8 @@ var xRegexSplitSimple func(string, string, RegexCompileFlags, RegexMatchFlags) [ | |||||
| 1544 | // characters. For example splitting "ab c" using as a separator | 1613 | // characters. For example splitting "ab c" using as a separator | ||
| 1545 | // "\s*", you will get "a", "b" and "c". | 1614 | // "\s*", you will get "a", "b" and "c". | ||
| 1546 | func RegexSplitSimple(PatternVar string, StringVar string, CompileOptionsVar RegexCompileFlags, MatchOptionsVar RegexMatchFlags) []string { | 1615 | func RegexSplitSimple(PatternVar string, StringVar string, CompileOptionsVar RegexCompileFlags, MatchOptionsVar RegexMatchFlags) []string { | ||
| 1616 | + | core.LazyRegister(&xRegexSplitSimple, "GLIB", "g_regex_split_simple", false) | |||
| 1617 | + | ||||
| 1547 | cret := xRegexSplitSimple(PatternVar, StringVar, CompileOptionsVar, MatchOptionsVar) | 1618 | cret := xRegexSplitSimple(PatternVar, StringVar, CompileOptionsVar, MatchOptionsVar) | ||
| 1548 | return cret | 1619 | return cret | ||
| 1549 | } | 1620 | } | ||
| @@ -1551,60 +1622,4 @@ func RegexSplitSimple(PatternVar string, StringVar string, CompileOptionsVar Reg | |||||
| 1551 | func init() { | 1622 | func init() { | ||
| 1552 | core.SetPackageName("GLIB", "glib-2.0") | 1623 | core.SetPackageName("GLIB", "glib-2.0") | ||
| 1553 | core.SetSharedLibraries("GLIB", []string{"libgobject-2.0.so.0", "libglib-2.0.so.0", "libgobject-2.0.0.dylib", "libglib-2.0.0.dylib"}) | 1624 | core.SetSharedLibraries("GLIB", []string{"libgobject-2.0.so.0", "libglib-2.0.so.0", "libgobject-2.0.0.dylib", "libglib-2.0.0.dylib"}) | ||
| 1554 | - | var libs []uintptr | |||
| 1555 | - | for _, libPath := range core.GetPaths("GLIB") { | |||
| 1556 | - | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |||
| 1557 | - | if err != nil { | |||
| 1558 | - | panic(err) | |||
| 1559 | - | } | |||
| 1560 | - | libs = append(libs, lib) | |||
| 1561 | - | } | |||
| 1562 | - | ||||
| 1563 | - | core.PuregoSafeRegister(&xRegexCheckReplacement, libs, "g_regex_check_replacement") | |||
| 1564 | - | core.PuregoSafeRegister(&xRegexEscapeNul, libs, "g_regex_escape_nul") | |||
| 1565 | - | core.PuregoSafeRegister(&xRegexEscapeString, libs, "g_regex_escape_string") | |||
| 1566 | - | core.PuregoSafeRegister(&xRegexMatchSimple, libs, "g_regex_match_simple") | |||
| 1567 | - | core.PuregoSafeRegister(&xRegexSplitSimple, libs, "g_regex_split_simple") | |||
| 1568 | - | ||||
| 1569 | - | core.PuregoSafeRegister(&xMatchInfoGLibType, libs, "g_match_info_get_type") | |||
| 1570 | - | ||||
| 1571 | - | core.PuregoSafeRegister(&xMatchInfoExpandReferences, libs, "g_match_info_expand_references") | |||
| 1572 | - | core.PuregoSafeRegister(&xMatchInfoFetch, libs, "g_match_info_fetch") | |||
| 1573 | - | core.PuregoSafeRegister(&xMatchInfoFetchAll, libs, "g_match_info_fetch_all") | |||
| 1574 | - | core.PuregoSafeRegister(&xMatchInfoFetchNamed, libs, "g_match_info_fetch_named") | |||
| 1575 | - | core.PuregoSafeRegister(&xMatchInfoFetchNamedPos, libs, "g_match_info_fetch_named_pos") | |||
| 1576 | - | core.PuregoSafeRegister(&xMatchInfoFetchPos, libs, "g_match_info_fetch_pos") | |||
| 1577 | - | core.PuregoSafeRegister(&xMatchInfoFree, libs, "g_match_info_free") | |||
| 1578 | - | core.PuregoSafeRegister(&xMatchInfoGetMatchCount, libs, "g_match_info_get_match_count") | |||
| 1579 | - | core.PuregoSafeRegister(&xMatchInfoGetRegex, libs, "g_match_info_get_regex") | |||
| 1580 | - | core.PuregoSafeRegister(&xMatchInfoGetString, libs, "g_match_info_get_string") | |||
| 1581 | - | core.PuregoSafeRegister(&xMatchInfoIsPartialMatch, libs, "g_match_info_is_partial_match") | |||
| 1582 | - | core.PuregoSafeRegister(&xMatchInfoMatches, libs, "g_match_info_matches") | |||
| 1583 | - | core.PuregoSafeRegister(&xMatchInfoNext, libs, "g_match_info_next") | |||
| 1584 | - | core.PuregoSafeRegister(&xMatchInfoRef, libs, "g_match_info_ref") | |||
| 1585 | - | core.PuregoSafeRegister(&xMatchInfoUnref, libs, "g_match_info_unref") | |||
| 1586 | - | ||||
| 1587 | - | core.PuregoSafeRegister(&xRegexGLibType, libs, "g_regex_get_type") | |||
| 1588 | - | ||||
| 1589 | - | core.PuregoSafeRegister(&xNewRegex, libs, "g_regex_new") | |||
| 1590 | - | ||||
| 1591 | - | core.PuregoSafeRegister(&xRegexGetCaptureCount, libs, "g_regex_get_capture_count") | |||
| 1592 | - | core.PuregoSafeRegister(&xRegexGetCompileFlags, libs, "g_regex_get_compile_flags") | |||
| 1593 | - | core.PuregoSafeRegister(&xRegexGetHasCrOrLf, libs, "g_regex_get_has_cr_or_lf") | |||
| 1594 | - | core.PuregoSafeRegister(&xRegexGetMatchFlags, libs, "g_regex_get_match_flags") | |||
| 1595 | - | core.PuregoSafeRegister(&xRegexGetMaxBackref, libs, "g_regex_get_max_backref") | |||
| 1596 | - | core.PuregoSafeRegister(&xRegexGetMaxLookbehind, libs, "g_regex_get_max_lookbehind") | |||
| 1597 | - | core.PuregoSafeRegister(&xRegexGetPattern, libs, "g_regex_get_pattern") | |||
| 1598 | - | core.PuregoSafeRegister(&xRegexGetStringNumber, libs, "g_regex_get_string_number") | |||
| 1599 | - | core.PuregoSafeRegister(&xRegexMatch, libs, "g_regex_match") | |||
| 1600 | - | core.PuregoSafeRegister(&xRegexMatchAll, libs, "g_regex_match_all") | |||
| 1601 | - | core.PuregoSafeRegister(&xRegexMatchAllFull, libs, "g_regex_match_all_full") | |||
| 1602 | - | core.PuregoSafeRegister(&xRegexMatchFull, libs, "g_regex_match_full") | |||
| 1603 | - | core.PuregoSafeRegister(&xRegexRef, libs, "g_regex_ref") | |||
| 1604 | - | core.PuregoSafeRegister(&xRegexReplace, libs, "g_regex_replace") | |||
| 1605 | - | core.PuregoSafeRegister(&xRegexReplaceEval, libs, "g_regex_replace_eval") | |||
| 1606 | - | core.PuregoSafeRegister(&xRegexReplaceLiteral, libs, "g_regex_replace_literal") | |||
| 1607 | - | core.PuregoSafeRegister(&xRegexSplit, libs, "g_regex_split") | |||
| 1608 | - | core.PuregoSafeRegister(&xRegexSplitFull, libs, "g_regex_split_full") | |||
| 1609 | - | core.PuregoSafeRegister(&xRegexUnref, libs, "g_regex_unref") | |||
| 1610 | } | 1625 | } | ||