aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorgingerBill <bill@gingerbill.org>2020-11-17 16:36:33 +0000
committergingerBill <bill@gingerbill.org>2020-11-17 16:36:33 +0000
commit11577db6a84d17998478dc22b607a203cdf00a7e (patch)
treed802441753cf323dd1d272c29168d9f1dc7fc45a
parentede25a88f80e34fdf7eabfbca50878c69cec59d9 (diff)
Minor fixes
-rw-r--r--core/path/filepath/path_windows.odin3
-rw-r--r--core/strings/strings.odin2
-rw-r--r--src/docs.cpp9
3 files changed, 7 insertions, 7 deletions
diff --git a/core/path/filepath/path_windows.odin b/core/path/filepath/path_windows.odin
index fc93bdfa2..b538e1640 100644
--- a/core/path/filepath/path_windows.odin
+++ b/core/path/filepath/path_windows.odin
@@ -8,7 +8,8 @@ SEPARATOR :: '\\';
SEPARATOR_STRING :: `\`;
LIST_SEPARATOR :: ';';
-reserved_names := []string{
+@(private)
+reserved_names := [?]string{
"CON", "PRN", "AUX", "NUL",
"COM1", "COM2", "COM3", "COM4", "COM5", "COM6", "COM7", "COM8", "COM9",
"LPT1", "LPT2", "LPT3", "LPT4", "LPT5", "LPT6", "LPT7", "LPT8", "LPT9",
diff --git a/core/strings/strings.odin b/core/strings/strings.odin
index 93f8fdc69..fd9e7299b 100644
--- a/core/strings/strings.odin
+++ b/core/strings/strings.odin
@@ -224,7 +224,7 @@ index_byte :: proc(s: string, c: byte) -> int {
return -1;
}
-// Returns i1 if c is not present
+// Returns -1 if c is not present
last_index_byte :: proc(s: string, c: byte) -> int {
for i := len(s)-1; i >= 0; i -= 1 {
if s[i] == c {
diff --git a/src/docs.cpp b/src/docs.cpp
index d023bf09a..d86f85c8d 100644
--- a/src/docs.cpp
+++ b/src/docs.cpp
@@ -1,6 +1,5 @@
// Generates Documentation
-
gb_global int print_entity_kind_ordering[Entity_Count] = {
/*Invalid*/ -1,
/*Constant*/ 0,
@@ -41,10 +40,9 @@ GB_COMPARE_PROC(cmp_entities_for_printing) {
}
int ox = print_entity_kind_ordering[x->kind];
int oy = print_entity_kind_ordering[y->kind];
- if (ox < oy) {
- return -1;
- } else if (ox > oy) {
- return +1;
+ res = ox - oy;
+ if (res != 0) {
+ return res;
}
res = string_compare(x->token.string, y->token.string);
return res;
@@ -96,6 +94,7 @@ bool print_doc_comment_group_string(i32 indent, CommentGroup *g) {
for_array(i, g->list) {
String comment = g->list[i].string;
bool slash_slash = comment[1] == '/';
+ bool slash_star = comment[1] == '*';
if (comment[1] == '/') {
comment.text += 2;
comment.len -= 2;