Skip to content

Added *tiny* examples of changes when defer is merged. #1

New issue

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

#

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

Already on GitHub? # to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Added *tiny* examples of changes when defer is merged. #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
45 changes: 45 additions & 0 deletions toml_parser/main.c2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@ module test;
import stdio local;
import toml;

//#define USE_DEFER

#ifdef USE_DEFER
public func i32 main(i32 argc, char*[] argv) {
if (argc != 2) {
printf("Usage: parser [toml-file]\n");
Expand All @@ -11,8 +14,11 @@ public func i32 main(i32 argc, char*[] argv) {
const char* filename = argv[1];

toml.Reader* reader = toml.Reader.create();
defer reader.destroy();

if (!reader.parse(filename)) {
printf("Error parsing %s: %s\n", filename, reader.getMsg());
return -1;
}

// getValue
Expand All @@ -38,7 +44,46 @@ public func i32 main(i32 argc, char*[] argv) {
iter.next();
}

return 0;
}

#else
public func i32 main(i32 argc, char*[] argv) {
if (argc != 2) {
printf("Usage: parser [toml-file]\n");
return 0;
}
const char* filename = argv[1];

toml.Reader* reader = toml.Reader.create();
if (!reader.parse(filename)) {
printf("Error parsing %s: %s\n", filename, reader.getMsg());
}

// getValue
const char* key = "room.name";
printf("Value %s = %s\n", key, reader.getValue(key));
key = "room.descr";
printf("Value %s = %s\n", key, reader.getValue(key));

// ValueIter
toml.ValueIter vi = reader.getValueIter("room.domains");
printf("Domains:\n");
while (!vi.done()) {
printf(" %s\n", vi.getValue());
vi.next();
}

// NodeIter
printf("Exits:\n");
toml.NodeIter iter = reader.getNodeIter("exit");
while (!iter.done()) {
const char* name = iter.getValue("name");
printf(" name=%s\n", name);
iter.next();
}
reader.destroy();
return 0;
}
#endif

21 changes: 21 additions & 0 deletions toml_parser/toml_parser.c2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -373,10 +373,30 @@ public func const char* Reader.getMsg(const Reader* r) {
return r.message;
}

//#define USE_DEFER

#ifdef USE_DEFER
public func bool Reader.parse(Reader* r, const char* filename) {
file_utils.Reader file;
file.open(filename);
defer file.close();

if (file.isEmpty()) {
printf("file %s is empty\n", filename);
return false;
}
Parser parser;
bool status = parser.parse(cast<const char*>(file.data()), r.message, r.blocks);

#ifdef DEBUG_NODES
r.blocks.dump();
#endif
return status;
}
#else
public func bool Reader.parse(Reader* r, const char* filename) {
file_utils.Reader file;
file.open(filename);
if (file.isEmpty()) {
printf("file %s is empty\n", filename);
file.close();
Expand All @@ -391,6 +411,7 @@ public func bool Reader.parse(Reader* r, const char* filename) {
#endif
return status;
}
#endif

// --------------------------------------------------------------
// Getters+iters
Expand Down