Skip to content

c3fmt for 0.7.7 #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ccll wants to merge 6 commits into
base: main
Choose a base branch
from
Open

c3fmt for 0.7.7 #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
240fc6f
upgrade c3fmt to 0.7.7 syntax
ccll Nov 21, 2025
e5af266
fix def->alias, distinct->typedef, fault->faultdef, anyfault->fault
ccll Nov 21, 2025
78510d6
fix generic fields in struct
ccll Nov 21, 2025
93feb2a
wip: fix generics in struct
ccll Nov 21, 2025
0a2f019
fix generic type in struct scope
ccll Nov 28, 2025
8a22004
add more tests for generics
ccll Nov 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,6 @@ scripts/c3fmt_gentests
test/c3tools/codefmt/test_c3fmt_corpus.c3
# exclude c3c/ used in CI/CD
c3c/
*.exe
*.lib
*.pdb
8 changes: 4 additions & 4 deletions lib/c3lib/argparse/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ fn void test_custom_type_callback_unknown_type()
{

char val = '\0';
ArgParseCallbackFn cbf = fn void! (ArgOpt* opt, String value) {
ArgParseCallbackFn cbf = fn void? (ArgOpt* opt, String value) {
io::printfn("flt--callback");
test::eq(value, "bar");
*anycast(opt.value, char)! = value[0];
Expand All @@ -89,7 +89,7 @@ fn void test_custom_type_callback_unknown_type()
.short_name = 'o',
.long_name = "other",
.value = &my_app_state,
.callback = fn void! (ArgOpt* opt, String value) {
.callback = fn void? (ArgOpt* opt, String value) {
ArgParse* ctx = anycast(opt.value, ArgParse)!;
io::printfn("other--callback");
// NOTE: pretends to update important app struct
Expand Down Expand Up @@ -119,8 +119,8 @@ fn void test_custom_type_callback_unknown_type()
fn void test_argparse_next_switch()
{

List(<String>) args;
args.new_init();
List{String} args;
args.init(mem);
defer args.free();

ArgParse agp = {
Expand Down
129 changes: 64 additions & 65 deletions lib/c3lib/argparse/argparse.c3
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,8 +144,8 @@ different types.
Example of parsing array of numbers:
```c3

List(<int>) numbers;
numbers.new_init();
List{int} numbers;
numbers.init(mem);
defer numbers.free();

ArgParse agp = {
Expand All @@ -155,8 +155,8 @@ ArgParse agp = {
.long_name = "num",
.value = &numbers,
.allow_many = true,
.callback = fn void! (ArgOpt* opt, String value) {
List(<int>) * ctx = anycast(opt.value, List(<int>))!;
.callback = fn void? (ArgOpt* opt, String value) {
List{int} * ctx = anycast(opt.value, List{int})!;
int val = value.to_integer(int)!;
ctx.push(val);
}
Expand All @@ -168,19 +168,19 @@ ArgParse agp = {
param opt "ArgOpt related to option parsed"
param value "raw string value from command line argv"
*>
def ArgParseCallbackFn = fn void! (ArgOpt* opt, String value);
alias ArgParseCallbackFn = fn void? (ArgOpt* opt, String value);

<*
Special template option for --help/-h - prints usage
*>
macro help_opt(String help_prompt = "show this help message and exit")
{
return ArgOpt {
return (ArgOpt) {
._arg_type = ArgType.HELP,
.short_name = 'h',
.long_name = "help",
.help = help_prompt,
.value = any_make(null,bool.typeid),
.value = any_make(null,bool.typeid)
};
}

Expand All @@ -189,10 +189,7 @@ Section separator in usage printout
*>
macro group_opt(String group_name)
{
return ArgOpt {
._arg_type = ArgType.GROUP,
.help = group_name,
};
return (ArgOpt){._arg_type = ArgType.GROUP, .help = group_name };
}

<*
Expand All @@ -207,8 +204,8 @@ Example:
```c3
fn void test_argparse_next_all_together()
{
List(<String>) args;
args.new_init();
List{String} args;
args.init(mem);
defer args.free();

String[] argv = { "testprog", "-n", "5", "--num", "2", "--foo=3", "--", "-fex", "-I./foo"};
Expand All @@ -225,7 +222,7 @@ fn void test_argparse_next_all_together()

Switching over options:
```c3
int! sum_args(String argv[])
int? sum_args(String argv[])
{
ArgParse agp = {
.description = "Test number sum program",
Expand Down Expand Up @@ -254,7 +251,7 @@ int! sum_args(String argv[])
}
```
*>
fn String! ArgParse.next(&self, String[] argv)
fn String? ArgParse.next(&self, String[] argv)
{
assert(self.arguments.len == 0, "ArgParse already initialized or double parse call");

Expand All @@ -274,7 +271,7 @@ fn String! ArgParse.next(&self, String[] argv)
String arg = self._ctx.argv[0];
if (arg.len == 0) {
io::printf("Error: argument too short `%s`\n", arg);
return ArgError.INVALID_ARGUMENT?;
return INVALID_ARGUMENT?;
}
if (self._ctx.cpidx > 0) {
// we have --opt=foo, return 'foo' part
Expand All @@ -287,7 +284,7 @@ fn String! ArgParse.next(&self, String[] argv)

if (idx == arg.len-1) {
io::printf("Error: option has no value `%s`\n", arg);
return ArgError.INVALID_ARGUMENT?;
return INVALID_ARGUMENT?;
}
arg = arg[..idx-1];
// return '--opt' part
Expand All @@ -305,11 +302,11 @@ fn String! ArgParse.next(&self, String[] argv)
<*
Parses all arguments.

@param argv "arguments list from system argv or from previous argparse.arguments for subcommands"
@return! ArgError.INVALID_ARGUMENT
@return! ArgError.MISSING_ARGUMENT
@param argv: "arguments list from system argv or from previous argparse.arguments for subcommands"
@return? INVALID_ARGUMENT
@return? MISSING_ARGUMENT
*>
fn void! ArgParse.parse(&self, String[] argv)
fn void? ArgParse.parse(&self, String[] argv)
{
assert(self.arguments.len == 0, "ArgParse already initialized or double parse call");
assert(!self._ctx.has_argument, "ArgParse.next() already used before (pick only one way)?");
Expand All @@ -330,7 +327,7 @@ fn void! ArgParse.parse(&self, String[] argv)
// io::printf("arg: %s\n", arg);
if (arg.len == 0) {
io::printf("Error: argument too short `%s`\n", arg);
return ArgError.INVALID_ARGUMENT?;
return INVALID_ARGUMENT?;
}

if (arg.len == 1 || arg[0] != '-' || arg[1] == '\0') {
Expand All @@ -352,7 +349,7 @@ fn void! ArgParse.parse(&self, String[] argv)

if (self._ctx.has_argument) {
io::printf("Error: passing options after arguments not allowed at `%s`\n", arg);
return ArgError.INVALID_ARGUMENT?;
return INVALID_ARGUMENT?;
}

self.parse_short_arg()!;
Expand All @@ -375,7 +372,7 @@ fn void! ArgParse.parse(&self, String[] argv)

if (self._ctx.has_argument) {
io::printf("Error: passing options after arguments not allowed at `%s`\n", arg);
return ArgError.INVALID_ARGUMENT?;
return INVALID_ARGUMENT?;
}

self.parse_long_arg()!;
Expand All @@ -388,14 +385,14 @@ fn void! ArgParse.parse(&self, String[] argv)
self.arguments = argv[self._ctx.cpidx + 1 ..]; // excludes 1st argv[0], program_name
if (self.flags.require_arguments && self.arguments.len == 0) {
io::printf("Error: positional argument expected\n");
return ArgError.MISSING_ARGUMENT?;
return MISSING_ARGUMENT?;
}
}

<*
Prints program usage based on ArgParse fields composition
*>
fn void! ArgParse.print_usage(&self)
fn void? ArgParse.print_usage(&self)
{
assert(self.options.len > 0, "ArgParse is not properly configured, or using ArgParse.next()");

Expand All @@ -404,7 +401,7 @@ fn void! ArgParse.print_usage(&self)
@pool() {
// NOTE: prepending program_name to all usage line

path::Path path = path::temp_new(self.program_name)!;
path::Path path = path::temp(self.program_name)!;
foreach (usage : self.usage.tsplit("\n")) {
usage = usage.trim();
if (!usage) {
Expand Down Expand Up @@ -529,14 +526,12 @@ fn void! ArgParse.print_usage(&self)
* PRIVATE IMPLEMENTATION
*/

fault ArgError @private
{
faultdef
MISSING_ARGUMENT,
INVALID_ARGUMENT,
ARGUMENT_VALUE,
CONFIGURATION,
HELP_SHOW,
}
HELP_SHOW;

enum ArgType : int @private
{
Expand All @@ -547,7 +542,7 @@ enum ArgType : int @private

$assert(ArgType.USER.ordinal == 0); // USER must be first to support ZII behavior

fn void! ArgParse.options_ensure_required(&self) @local
fn void? ArgParse.options_ensure_required(&self) @local
{
bool has_errors = false;
foreach (i, opt : self.options) {
Expand All @@ -561,11 +556,11 @@ fn void! ArgParse.options_ensure_required(&self) @local
}
}
if (has_errors) {
return ArgError.MISSING_ARGUMENT?;
return MISSING_ARGUMENT?;
}
}

fn void! ArgParse.options_check(&self) @local
fn void? ArgParse.options_check(&self) @local
{
assert(self.arguments.len == 0, "already processed?");

Expand Down Expand Up @@ -625,7 +620,7 @@ fn void! ArgParse.options_check(&self) @local
}
}

fn String! ArgParse.get_arg(&self) @local
fn String? ArgParse.get_arg(&self) @local
{
if (self._ctx.optvalue) {
// --arg=<optvalue> via =
Expand All @@ -641,26 +636,26 @@ fn String! ArgParse.get_arg(&self) @local
"Error: getting another option instead of previous option value at `%s`\n",
self._ctx.argv[0]
);
return ArgError.ARGUMENT_VALUE?;
return ARGUMENT_VALUE?;
}
return result;
} else {
io::printf("Error: missing argument value for %s\n", self._ctx.argv[0]);
return ArgError.ARGUMENT_VALUE?;
return ARGUMENT_VALUE?;
}

}

fn void! ArgParse.parse_arg_val(&self, ArgOpt* opt, bool flag_unset = false) @local
fn void? ArgParse.parse_arg_val(&self, ArgOpt* opt, bool flag_unset = false) @local
{
assert(opt);
if (opt._arg_type == ArgType.HELP) {
return ArgError.HELP_SHOW?;
return HELP_SHOW?;
}

if (opt._is_present && !opt.allow_many) {
io::printf("Error: duplicated option %s\n", self._ctx.argv[0]);
return ArgError.INVALID_ARGUMENT?;
return INVALID_ARGUMENT?;
}

assert(opt.value);
Expand Down Expand Up @@ -714,41 +709,43 @@ fn void! ArgParse.parse_arg_val(&self, ArgOpt* opt, bool flag_unset = false) @lo
}
}

fn void! ArgParse.parse_short_arg(&self) @local
fn void? ArgParse.parse_short_arg(&self) @local
{
foreach (&opt : self.options) {
if (opt.short_name == self._ctx.optvalue[0]) {
self._ctx.optvalue = self._ctx.optvalue.len > 1 ? self._ctx.optvalue[1..] : "";
if (catch err = self.parse_arg_val(opt)) {
case ArgError.MISSING_ARGUMENT:
case ArgError.INVALID_ARGUMENT:
case ArgError.ARGUMENT_VALUE:
case ArgError.CONFIGURATION:
case ArgError.HELP_SHOW:
switch (err) {
case MISSING_ARGUMENT:
case INVALID_ARGUMENT:
case ARGUMENT_VALUE:
case CONFIGURATION:
case HELP_SHOW:
return err?;
default:
io::printf(
"Error: argument parse error -%s failed with `%s`\n", opt.short_name, err
);
return ArgError.ARGUMENT_VALUE?;
return ARGUMENT_VALUE?;
}
}
return; // ALL OK
}
}
io::printf("Error: invalid argument %s\n", self._ctx.argv[0]);
return ArgError.INVALID_ARGUMENT?;
return INVALID_ARGUMENT?;
}

fn String! prefix_skip(String s, String prefix) @local
fn String? prefix_skip(String s, String prefix) @local
{
if (s.starts_with(prefix)) {
return s[prefix.len ..];
} else {
return ArgError.MISSING_ARGUMENT?;
return MISSING_ARGUMENT?;
}
}

fn void! ArgParse.parse_long_arg(&self) @local
fn void? ArgParse.parse_long_arg(&self) @local
{
foreach (&opt : self.options) {
if (!opt.long_name) {
Expand All @@ -757,10 +754,10 @@ fn void! ArgParse.parse_long_arg(&self) @local

int opt_flags = 0;
bool flag_unset = false;
String! arg = prefix_skip(self._ctx.argv[0][2..], opt.long_name);
String? arg = prefix_skip(self._ctx.argv[0][2..], opt.long_name);
if (catch err = arg) {
switch (err) {
case ArgError.MISSING_ARGUMENT:
case MISSING_ARGUMENT:
// NOTE: for boolean flags it's possible to pass unset with '--no-<flag_name>'
if (
opt.value.type == bool.typeid &&
Expand All @@ -781,21 +778,23 @@ fn void! ArgParse.parse_long_arg(&self) @local
}

if (catch err = self.parse_arg_val(opt, flag_unset)) {
case ArgError.MISSING_ARGUMENT:
case ArgError.INVALID_ARGUMENT:
case ArgError.ARGUMENT_VALUE:
case ArgError.CONFIGURATION:
case ArgError.HELP_SHOW:
return err?;
default:
io::printf(
"Error: argument parse error %s failed with `%s`\n", self._ctx.argv[0], err
);
return ArgError.ARGUMENT_VALUE?;
switch (err) {
case MISSING_ARGUMENT:
case INVALID_ARGUMENT:
case ARGUMENT_VALUE:
case CONFIGURATION:
case HELP_SHOW:
return err?;
default:
io::printf(
"Error: argument parse error %s failed with `%s`\n", self._ctx.argv[0], err
);
return ARGUMENT_VALUE?;
}
}
return; // ALL OK
}

io::printf("Error: invalid argument %s\n", self._ctx.argv[0]);
return ArgError.INVALID_ARGUMENT?;
return INVALID_ARGUMENT?;
}
Loading
Loading