john/cell
1
0
Fork 0
Code Issues 31 Pull Requests Packages Projects Releases 2 Wiki Activity

glob

Browse Source
This commit is contained in:
John Alanbrook
2024-11-18 15:55:52 -06:00
parent 222e9035c3
commit cac380e673
8 changed files with 128 additions and 345 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
scripts/actor.js
View File

@@ -4,8 +4,16 @@ var actor_urs = {};
var actor_spawns = {};
function class_eval(script)
{
var script_fns = {};
var script_fn = function script_fn(file) {
var script = Resources.replstrs(file);
script = `(function use_${file.name()}() { var self = this; var $ = this.__proto__; ${script}; })`;
var fn = os.eval(file,script);
return fn;
}.hashify();
globalThis.class_use = function class_use(script, config, base, callback) {
var file = Resources.find_script(script);
if (!file) {
@@ -27,26 +35,7 @@ function class_eval(script)
if (callback) callback(padawan);
var script = Resources.replstrs(file);
script = `(function use_${file.name()}() { var self = this; var $ = this.__proto__; ${script}; })`;
var fn = os.eval(file, script);
return {
usefn: fn,
file: file,
parent: actor_urs[file]
};
}.hashify();
globalThis.class_use = function class_use(script, config, base, callback) {
var prog = class_eval(script);
var padawan = Object.create(prog.parent);
actor_spawns[file].push(padawan);
padawan._file = prog.file;
padawan._root = prog.file.dir();
if (callback) callback(padawan);
prog.fn.call(padawan);
script_fn(file).call(padawan);
if (typeof config === "object") Object.merge(padawan, config);

81
scripts/engine.js
View File

@@ -101,7 +101,7 @@ Resources.replstrs = function replstrs(path) {
});
return script;
};
}
Resources.is_sound = function (path) {
var ext = path.ext();
@@ -172,7 +172,6 @@ function find_ext(file, ext, root = "") {
for (var e of ext) {
var finds = all_files.filter(x => x.ext() === e);
if (finds.length > 1) {
console.info(finds);
console.warn(`Found conflicting files when searching for '${file}': ${json.encode(finds)}. Returning the topmost one.`);
finds.sort((a,b) => a.length-b.length);
return finds[0];
@@ -324,6 +323,7 @@ globalThis.use = function use(file) {
};
var allpaths = io.ls();
allpaths = [...new Set(allpaths)]
//console.log(`found ${allpaths.length} files`);
//console.log(json.encode(allpaths))
@@ -378,10 +378,87 @@ io.globToRegex = function globToRegex(glob) {
};
io.glob = function glob(pat) {
return doglob(pat);
var regex = io.globToRegex(pat);
return allpaths.filter(str => str.match(regex)).sort();
}
function splitPath(path) {
return path.split('/').filter(part => part.length > 0);
}
function splitPattern(pattern) {
return pattern.split('/').filter(part => part.length > 0);
}
function matchPath(pathParts, patternParts) {
let pathIndex = 0;
let patternIndex = 0;
let starPatternIndex = -1;
let starPathIndex = -1;
while (pathIndex < pathParts.length) {
if (patternIndex < patternParts.length) {
if (patternParts[patternIndex] === '**') {
// Record the position of '**' in the pattern
starPatternIndex = patternIndex;
// Record the current position in the path
starPathIndex = pathIndex;
// Move to the next pattern component
patternIndex++;
continue;
} else if (
patternParts[patternIndex] === '*' ||
patternParts[patternIndex] === pathParts[pathIndex]
) {
// If the pattern is '*' or exact match, move to the next component
patternIndex++;
pathIndex++;
continue;
}
}
if (starPatternIndex !== -1) {
// If there was a previous '**', backtrack
patternIndex = starPatternIndex + 1;
starPathIndex++;
pathIndex = starPathIndex;
continue;
}
// No match and no '**' to backtrack to
return false;
}
// Check for remaining '**' in the pattern
while (patternIndex < patternParts.length && patternParts[patternIndex] === '**') {
patternIndex++;
}
return patternIndex === patternParts.length;
}
function doglob(pattern) {
const patternParts = splitPattern(pattern);
const matches = [];
console.log("DOGLOB");
for (let i = 0; i < allpaths.length; i++) {
const path = allpaths[i];
const pathParts = splitPath(path);
console.log(`testing ${json.encode(pathParts)} to ${json.encode(patternParts)}`);
if (matchPath(pathParts, patternParts)) {
matches.push(path);
}
}
// Optional: Sort the matches if needed
return matches.sort();
}
console.log(doglob("sprites/*.png"))
function stripped_use(file, script) {
file = Resources.find_script(file);

6
scripts/prosperon.js
View File

@@ -32,9 +32,7 @@ global.mixin("debug");
global.mixin('layout')
globalThis.parseq = use('parseq');
var frame_t = profile.secs(profile.now());
var sim = {};
globalThis.sim = {};
sim.mode = "play";
sim.play = function () {
this.mode = "play";
@@ -62,6 +60,8 @@ sim.stepping = function () {
return this.mode === "step";
};
var frame_t = profile.secs(profile.now());
var physlag = 0;
prosperon.SIGABRT = function()

36
source/jsffi.c
View File

@@ -130,6 +130,7 @@ JSValue sapp_event2js(JSContext *js, sapp_event *e)
JS_SetPropertyStr(js,event,"mouse_d", vec22js(js, (HMM_Vec2){e->mouse_dx,e->mouse_dy}));
JS_SetPropertyStr(js,event, "window_size", vec22js(js, (HMM_Vec2){e->window_width,e->window_height}));
JS_SetPropertyStr(js,event, "framebuffer", vec22js(js,(HMM_Vec2){e->framebuffer_width,e->framebuffer_height}));
JSValue files = JS_UNDEFINED;
switch(e->type) {
case SAPP_EVENTTYPE_MOUSE_SCROLL:
@@ -168,7 +169,7 @@ JSValue sapp_event2js(JSContext *js, sapp_event *e)
JS_SetPropertyStr(js, event, "modifiers", JS_NewBool(js, e->modifiers));
break;
case SAPP_EVENTTYPE_FILES_DROPPED:
JSValue files = JS_NewObject(js);
files = JS_NewObject(js);
for (int i = 0; i < sapp_get_num_dropped_files(); i++)
JS_SetPropertyUint32(js,files,i,JS_NewString(js,sapp_get_dropped_file_path(0)));
JS_SetPropertyStr(js,event,"files",files);
@@ -1788,8 +1789,7 @@ static void list_files(const char *path, JSContext *js, JSValue v, int *n)
if (file.is_dir) {
if (!strcmp(file.name, ".") || !strcmp(file.name, "..")) continue;
list_files(file.path, js, v, n);
}
else {
} else {
JS_SetPropertyUint32(js, v, *n, JS_NewString(js, file.path+2));
*n = *n+1;
}
@@ -1809,6 +1809,35 @@ JSC_SCALL(io_chdir, ret = number2js(js,chdir(str)))
JSC_SCALL(io_rm, ret = number2js(js,remove(str)))
JSC_SCALL(io_mkdir, ret = number2js(js,mkdir(str,0777)))
// glob sprites/*.png
// glob **/*.png
int glob_twostar(char *glob, char *text)
{
}
int glob_star(char *glob, char *text)
{
}
int glob_match(char *glob, char *text)
{
if (glob[0] == '*') {
if (glob[1] == '*')
return glob_twostar(glob+2, text);
return glob_star(glob+1, text);
}
if (glob[0] == '?')
return glob_match(glob+1,text+1);
return 0;
}
JSC_SSALL(io_glob, return JS_ToBool(js, glob_match(str, str2)); )
#include <quickjs.h>
#include <stdlib.h>
#include <stdio.h>
@@ -3016,4 +3045,3 @@ void ffi_load(JSContext *js) {
JS_FreeValue(js,globalThis);
}

311
source/khrplatform.h
View File

@@ -1,311 +0,0 @@
#ifndef __khrplatform_h_
#define __khrplatform_h_
/*
** Copyright (c) 2008-2018 The Khronos Group Inc.
**
** Permission is hereby granted, free of charge, to any person obtaining a
** copy of this software and/or associated documentation files (the
** "Materials"), to deal in the Materials without restriction, including
** without limitation the rights to use, copy, modify, merge, publish,
** distribute, sublicense, and/or sell copies of the Materials, and to
** permit persons to whom the Materials are furnished to do so, subject to
** the following conditions:
**
** The above copyright notice and this permission notice shall be included
** in all copies or substantial portions of the Materials.
**
** THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
** EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
** MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
** IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
** CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
** TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
** MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
*/
/* Khronos platform-specific types and definitions.
*
* The master copy of khrplatform.h is maintained in the Khronos EGL
* Registry repository at https://github.com/KhronosGroup/EGL-Registry
* The last semantic modification to khrplatform.h was at commit ID:
* 67a3e0864c2d75ea5287b9f3d2eb74a745936692
*
* Adopters may modify this file to suit their platform. Adopters are
* encouraged to submit platform specific modifications to the Khronos
* group so that they can be included in future versions of this file.
* Please submit changes by filing pull requests or issues on
* the EGL Registry repository linked above.
*
*
* See the Implementer's Guidelines for information about where this file
* should be located on your system and for more details of its use:
* http://www.khronos.org/registry/implementers_guide.pdf
*
* This file should be included as
* #include <KHR/khrplatform.h>
* by Khronos client API header files that use its types and defines.
*
* The types in khrplatform.h should only be used to define API-specific types.
*
* Types defined in khrplatform.h:
* khronos_int8_t signed 8 bit
* khronos_uint8_t unsigned 8 bit
* khronos_int16_t signed 16 bit
* khronos_uint16_t unsigned 16 bit
* khronos_int32_t signed 32 bit
* khronos_uint32_t unsigned 32 bit
* khronos_int64_t signed 64 bit
* khronos_uint64_t unsigned 64 bit
* khronos_intptr_t signed same number of bits as a pointer
* khronos_uintptr_t unsigned same number of bits as a pointer
* khronos_ssize_t signed size
* khronos_usize_t unsigned size
* khronos_float_t signed 32 bit floating point
* khronos_time_ns_t unsigned 64 bit time in nanoseconds
* khronos_utime_nanoseconds_t unsigned time interval or absolute time in
* nanoseconds
* khronos_stime_nanoseconds_t signed time interval in nanoseconds
* khronos_boolean_enum_t enumerated boolean type. This should
* only be used as a base type when a client API's boolean type is
* an enum. Client APIs which use an integer or other type for
* booleans cannot use this as the base type for their boolean.
*
* Tokens defined in khrplatform.h:
*
* KHRONOS_FALSE, KHRONOS_TRUE Enumerated boolean false/true values.
*
* KHRONOS_SUPPORT_INT64 is 1 if 64 bit integers are supported; otherwise 0.
* KHRONOS_SUPPORT_FLOAT is 1 if floats are supported; otherwise 0.
*
* Calling convention macros defined in this file:
* KHRONOS_APICALL
* KHRONOS_APIENTRY
* KHRONOS_APIATTRIBUTES
*
* These may be used in function prototypes as:
*
* KHRONOS_APICALL void KHRONOS_APIENTRY funcname(
* int arg1,
* int arg2) KHRONOS_APIATTRIBUTES;
*/
#if defined(__SCITECH_SNAP__) && !defined(KHRONOS_STATIC)
# define KHRONOS_STATIC 1
#endif
/*-------------------------------------------------------------------------
* Definition of KHRONOS_APICALL
*-------------------------------------------------------------------------
* This precedes the return type of the function in the function prototype.
*/
#if defined(KHRONOS_STATIC)
/* If the preprocessor constant KHRONOS_STATIC is defined, make the
* header compatible with static linking. */
# define KHRONOS_APICALL
#elif defined(_WIN32)
# define KHRONOS_APICALL __declspec(dllimport)
#elif defined (__SYMBIAN32__)
# define KHRONOS_APICALL IMPORT_C
#elif defined(__ANDROID__)
# define KHRONOS_APICALL __attribute__((visibility("default")))
#else
# define KHRONOS_APICALL
#endif
/*-------------------------------------------------------------------------
* Definition of KHRONOS_APIENTRY
*-------------------------------------------------------------------------
* This follows the return type of the function and precedes the function
* name in the function prototype.
*/
#if defined(_WIN32) && !defined(_WIN32_WCE) && !defined(__SCITECH_SNAP__)
/* Win32 but not WinCE */
# define KHRONOS_APIENTRY __stdcall
#else
# define KHRONOS_APIENTRY
#endif
/*-------------------------------------------------------------------------
* Definition of KHRONOS_APIATTRIBUTES
*-------------------------------------------------------------------------
* This follows the closing parenthesis of the function prototype arguments.
*/
#if defined (__ARMCC_2__)
#define KHRONOS_APIATTRIBUTES __softfp
#else
#define KHRONOS_APIATTRIBUTES
#endif
/*-------------------------------------------------------------------------
* basic type definitions
*-----------------------------------------------------------------------*/
#if (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) || defined(__GNUC__) || defined(__SCO__) || defined(__USLC__)
/*
* Using <stdint.h>
*/
#include <stdint.h>
typedef int32_t khronos_int32_t;
typedef uint32_t khronos_uint32_t;
typedef int64_t khronos_int64_t;
typedef uint64_t khronos_uint64_t;
#define KHRONOS_SUPPORT_INT64 1
#define KHRONOS_SUPPORT_FLOAT 1
/*
* To support platform where unsigned long cannot be used interchangeably with
* inptr_t (e.g. CHERI-extended ISAs), we can use the stdint.h intptr_t.
* Ideally, we could just use (u)intptr_t everywhere, but this could result in
* ABI breakage if khronos_uintptr_t is changed from unsigned long to
* unsigned long long or similar (this results in different C++ name mangling).
* To avoid changes for existing platforms, we restrict usage of intptr_t to
* platforms where the size of a pointer is larger than the size of long.
*/
#if defined(__SIZEOF_LONG__) && defined(__SIZEOF_POINTER__)
#if __SIZEOF_POINTER__ > __SIZEOF_LONG__
#define KHRONOS_USE_INTPTR_T
#endif
#endif
#elif defined(__VMS ) || defined(__sgi)
/*
* Using <inttypes.h>
*/
#include <inttypes.h>
typedef int32_t khronos_int32_t;
typedef uint32_t khronos_uint32_t;
typedef int64_t khronos_int64_t;
typedef uint64_t khronos_uint64_t;
#define KHRONOS_SUPPORT_INT64 1
#define KHRONOS_SUPPORT_FLOAT 1
#elif defined(_WIN32) && !defined(__SCITECH_SNAP__)
/*
* Win32
*/
typedef __int32 khronos_int32_t;
typedef unsigned __int32 khronos_uint32_t;
typedef __int64 khronos_int64_t;
typedef unsigned __int64 khronos_uint64_t;
#define KHRONOS_SUPPORT_INT64 1
#define KHRONOS_SUPPORT_FLOAT 1
#elif defined(__sun__) || defined(__digital__)
/*
* Sun or Digital
*/
typedef int khronos_int32_t;
typedef unsigned int khronos_uint32_t;
#if defined(__arch64__) || defined(_LP64)
typedef long int khronos_int64_t;
typedef unsigned long int khronos_uint64_t;
#else
typedef long long int khronos_int64_t;
typedef unsigned long long int khronos_uint64_t;
#endif /* __arch64__ */
#define KHRONOS_SUPPORT_INT64 1
#define KHRONOS_SUPPORT_FLOAT 1
#elif 0
/*
* Hypothetical platform with no float or int64 support
*/
typedef int khronos_int32_t;
typedef unsigned int khronos_uint32_t;
#define KHRONOS_SUPPORT_INT64 0
#define KHRONOS_SUPPORT_FLOAT 0
#else
/*
* Generic fallback
*/
#include <stdint.h>
typedef int32_t khronos_int32_t;
typedef uint32_t khronos_uint32_t;
typedef int64_t khronos_int64_t;
typedef uint64_t khronos_uint64_t;
#define KHRONOS_SUPPORT_INT64 1
#define KHRONOS_SUPPORT_FLOAT 1
#endif
/*
* Types that are (so far) the same on all platforms
*/
typedef signed char khronos_int8_t;
typedef unsigned char khronos_uint8_t;
typedef signed short int khronos_int16_t;
typedef unsigned short int khronos_uint16_t;
/*
* Types that differ between LLP64 and LP64 architectures - in LLP64,
* pointers are 64 bits, but 'long' is still 32 bits. Win64 appears
* to be the only LLP64 architecture in current use.
*/
#ifdef KHRONOS_USE_INTPTR_T
typedef intptr_t khronos_intptr_t;
typedef uintptr_t khronos_uintptr_t;
#elif defined(_WIN64)
typedef signed long long int khronos_intptr_t;
typedef unsigned long long int khronos_uintptr_t;
#else
typedef signed long int khronos_intptr_t;
typedef unsigned long int khronos_uintptr_t;
#endif
#if defined(_WIN64)
typedef signed long long int khronos_ssize_t;
typedef unsigned long long int khronos_usize_t;
#else
typedef signed long int khronos_ssize_t;
typedef unsigned long int khronos_usize_t;
#endif
#if KHRONOS_SUPPORT_FLOAT
/*
* Float type
*/
typedef float khronos_float_t;
#endif
#if KHRONOS_SUPPORT_INT64
/* Time types
*
* These types can be used to represent a time interval in nanoseconds or
* an absolute Unadjusted System Time. Unadjusted System Time is the number
* of nanoseconds since some arbitrary system event (e.g. since the last
* time the system booted). The Unadjusted System Time is an unsigned
* 64 bit value that wraps back to 0 every 584 years. Time intervals
* may be either signed or unsigned.
*/
typedef khronos_uint64_t khronos_utime_nanoseconds_t;
typedef khronos_int64_t khronos_stime_nanoseconds_t;
#endif
/*
* Dummy value used to pad enum types to 32 bits.
*/
#ifndef KHRONOS_MAX_ENUM
#define KHRONOS_MAX_ENUM 0x7FFFFFFF
#endif
/*
* Enumerated boolean type
*
* Values other than zero should be considered to be true. Therefore
* comparisons should not be made against KHRONOS_TRUE.
*/
typedef enum {
KHRONOS_FALSE = 0,
KHRONOS_TRUE = 1,
KHRONOS_BOOLEAN_ENUM_FORCE_SIZE = KHRONOS_MAX_ENUM
} khronos_boolean_enum_t;
#endif /* __khrplatform_h_ */

2
source/render.c
View File

@@ -55,7 +55,7 @@ void render_init() {
TracyCPlotConfig("size_update_buffer", TracyPlotFormatMemory, 1, 1, 547498235);
TracyCPlotConfig("size_append_buffer", TracyPlotFormatMemory, 1, 1, 12345615);
TracyCPlotConfig("size_update_image", TracyPlotFormatMemory, 1, 1, 49831049);
render_trace_init();
// render_trace_init();
#endif
std_sampler = sg_make_sampler(&(sg_sampler_desc){});

2
source/script.c
View File

@@ -8,7 +8,7 @@
#include <errno.h>
#include <stdarg.h>
#include "jsffi.h"
#include <malloc.h>
#include <stdlib.h>
#include <assert.h>
#include <tracy/TracyC.h>

2
source/yugine.c
View File

@@ -18,7 +18,7 @@ int main(int argc, char **argv) {
strcat(cmdstr, argv[i]);
if (argc > i+1) strcat(cmdstr, " ");
}
printf("evaling: %s\n", cmdstr);
script_evalf("cmd_args('%s');", cmdstr);
return 0;