Skip to content
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.

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

noun: actually use u3's version number #514

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion bazel/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ refresh_compile_commands(
# For example, specify a dict of targets and any flags required to build.
targets = [
"//pkg/ent",
"//pkg/noun",
"//pkg/u3",
"//pkg/ur",
"//pkg/urcrypt",
"//pkg/vere:urbit",
Expand Down
22 changes: 11 additions & 11 deletions pkg/noun/BUILD.bazel → pkg/u3/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
load("//bazel:common_settings.bzl", "vere_library")

vere_library(
name = "noun",
name = "u3",
srcs = glob(
[
"*.c",
Expand All @@ -15,16 +15,16 @@ vere_library(
"jets/**/*.c",
],
exclude = [
"noun.h",
"u3.h",
"*_tests.c",
],
),
hdrs = ["noun.h"],
hdrs = ["u3.h"],
includes = ["."],
linkopts = select({
# NOTE: macOS builds fail to link the `u3o_Config` symbol (and maybe
# others) without this. We should figure out why, and remove this.
"@platforms//os:macos": ["-force_load $(GENDIR)/pkg/noun/libnoun.a"],
"@platforms//os:macos": ["-force_load $(GENDIR)/pkg/u3/libu3.a"],
"//conditions:default": [],
}),
linkstatic = True,
Expand All @@ -42,8 +42,8 @@ vere_library(
"@sigsegv",
"@softfloat",
] + select({
"@platforms//os:macos": ["//pkg/noun/platform/darwin"],
"@platforms//os:linux": ["//pkg/noun/platform/linux"],
"@platforms//os:macos": ["//pkg/u3/platform/darwin"],
"@platforms//os:linux": ["//pkg/u3/platform/linux"],
"//conditions:default": [],
}),
)
Expand All @@ -61,7 +61,7 @@ cc_test(
"//conditions:default": [],
}),
visibility = ["//visibility:private"],
deps = [":noun"],
deps = [":u3"],
)

cc_test(
Expand All @@ -73,7 +73,7 @@ cc_test(
"//conditions:default": [],
}),
visibility = ["//visibility:private"],
deps = [":noun"],
deps = [":u3"],
)

cc_test(
Expand All @@ -85,7 +85,7 @@ cc_test(
"//conditions:default": [],
}),
visibility = ["//visibility:private"],
deps = [":noun"],
deps = [":u3"],
)

cc_test(
Expand All @@ -97,7 +97,7 @@ cc_test(
"//conditions:default": [],
}),
visibility = ["//visibility:private"],
deps = [":noun"],
deps = [":u3"],
)

cc_test(
Expand All @@ -109,5 +109,5 @@ cc_test(
"//conditions:default": [],
}),
visibility = ["//visibility:private"],
deps = [":noun"],
deps = [":u3"],
)
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion pkg/noun/hashtable_tests.c → pkg/u3/hashtable_tests.c
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/// @file

#include "noun.h"
#include "u3.h"

// defined in noun/hashtable.c
c3_w _ch_skip_slot(c3_w mug_w, c3_w lef_w);
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion pkg/noun/jets/a/add.c → pkg/u3/jets/a/add.c
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#include "jets/q.h"
#include "jets/w.h"

#include "noun.h"
#include "u3.h"

u3_noun
u3qa_add(u3_atom a,
Expand Down
2 changes: 1 addition & 1 deletion pkg/noun/jets/a/dec.c → pkg/u3/jets/a/dec.c
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#include "jets/q.h"
#include "jets/w.h"

#include "noun.h"
#include "u3.h"

u3_noun
u3qa_inc(u3_atom a)
Expand Down
2 changes: 1 addition & 1 deletion pkg/noun/jets/a/div.c → pkg/u3/jets/a/div.c
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#include "jets/q.h"
#include "jets/w.h"

#include "noun.h"
#include "u3.h"

u3_noun
u3qa_div(u3_atom a,
Expand Down
2 changes: 1 addition & 1 deletion pkg/noun/jets/a/gte.c → pkg/u3/jets/a/gte.c
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#include "jets/q.h"
#include "jets/w.h"

#include "noun.h"
#include "u3.h"

u3_noun
u3qa_gte(u3_atom a, u3_atom b)
Expand Down
2 changes: 1 addition & 1 deletion pkg/noun/jets/a/gth.c → pkg/u3/jets/a/gth.c
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#include "jets/q.h"
#include "jets/w.h"

#include "noun.h"
#include "u3.h"

u3_noun
u3qa_gth(u3_atom a, u3_atom b)
Expand Down
2 changes: 1 addition & 1 deletion pkg/noun/jets/a/lte.c → pkg/u3/jets/a/lte.c
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#include "jets/q.h"
#include "jets/w.h"

#include "noun.h"
#include "u3.h"

u3_noun
u3qa_lte(u3_atom a, u3_atom b)
Expand Down
2 changes: 1 addition & 1 deletion pkg/noun/jets/a/lth.c → pkg/u3/jets/a/lth.c
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#include "jets/q.h"
#include "jets/w.h"

#include "noun.h"
#include "u3.h"

u3_noun
u3qa_lth(u3_atom a, u3_atom b)
Expand Down
2 changes: 1 addition & 1 deletion pkg/noun/jets/a/max.c → pkg/u3/jets/a/max.c
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#include "jets/q.h"
#include "jets/w.h"

#include "noun.h"
#include "u3.h"

u3_noun
u3qa_max(u3_atom a, u3_atom b)
Expand Down
2 changes: 1 addition & 1 deletion pkg/noun/jets/a/min.c → pkg/u3/jets/a/min.c
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#include "jets/q.h"
#include "jets/w.h"

#include "noun.h"
#include "u3.h"

u3_noun
u3qa_min(u3_atom a, u3_atom b)
Expand Down
2 changes: 1 addition & 1 deletion pkg/noun/jets/a/mod.c → pkg/u3/jets/a/mod.c
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#include "jets/q.h"
#include "jets/w.h"

#include "noun.h"
#include "u3.h"

u3_noun
u3qa_mod(u3_atom a,
Expand Down
2 changes: 1 addition & 1 deletion pkg/noun/jets/a/mul.c → pkg/u3/jets/a/mul.c
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#include "jets/q.h"
#include "jets/w.h"

#include "noun.h"
#include "u3.h"

u3_noun
u3qa_mul(u3_atom a,
Expand Down
2 changes: 1 addition & 1 deletion pkg/noun/jets/a/sub.c → pkg/u3/jets/a/sub.c
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#include "jets/q.h"
#include "jets/w.h"

#include "noun.h"
#include "u3.h"

u3_noun
u3qa_sub(u3_atom a,
Expand Down
2 changes: 1 addition & 1 deletion pkg/noun/jets/b/bind.c → pkg/u3/jets/b/bind.c
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#include "jets/q.h"
#include "jets/w.h"

#include "noun.h"
#include "u3.h"


u3_noun
Expand Down
2 changes: 1 addition & 1 deletion pkg/noun/jets/b/clap.c → pkg/u3/jets/b/clap.c
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#include "jets/q.h"
#include "jets/w.h"

#include "noun.h"
#include "u3.h"


u3_noun
Expand Down
2 changes: 1 addition & 1 deletion pkg/noun/jets/b/drop.c → pkg/u3/jets/b/drop.c
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#include "jets/q.h"
#include "jets/w.h"

#include "noun.h"
#include "u3.h"


u3_noun
Expand Down
2 changes: 1 addition & 1 deletion pkg/noun/jets/b/find.c → pkg/u3/jets/b/find.c
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#include "jets/q.h"
#include "jets/w.h"

#include "noun.h"
#include "u3.h"

STATIC_ASSERT( (UINT32_MAX > u3a_cells),
"list index precision" );
Expand Down
2 changes: 1 addition & 1 deletion pkg/noun/jets/b/flop.c → pkg/u3/jets/b/flop.c
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#include "jets/q.h"
#include "jets/w.h"

#include "noun.h"
#include "u3.h"

u3_noun
u3qb_flop(u3_noun a)
Expand Down
2 changes: 1 addition & 1 deletion pkg/noun/jets/b/lent.c → pkg/u3/jets/b/lent.c
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#include "jets/q.h"
#include "jets/w.h"

#include "noun.h"
#include "u3.h"

STATIC_ASSERT( (UINT32_MAX > u3a_cells),
"length precision" );
Expand Down
2 changes: 1 addition & 1 deletion pkg/noun/jets/b/levy.c → pkg/u3/jets/b/levy.c
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#include "jets/q.h"
#include "jets/w.h"

#include "noun.h"
#include "u3.h"

static u3_noun
_levy_in(u3j_site* sit_u, u3_noun a)
Expand Down
2 changes: 1 addition & 1 deletion pkg/noun/jets/b/lien.c → pkg/u3/jets/b/lien.c
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#include "jets/q.h"
#include "jets/w.h"

#include "noun.h"
#include "u3.h"

static u3_noun
_lien_in(u3j_site* sit_u, u3_noun a)
Expand Down
2 changes: 1 addition & 1 deletion pkg/noun/jets/b/murn.c → pkg/u3/jets/b/murn.c
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#include "jets/q.h"
#include "jets/w.h"

#include "noun.h"
#include "u3.h"

u3_noun
u3qb_murn(u3_noun a, u3_noun b)
Expand Down
2 changes: 1 addition & 1 deletion pkg/noun/jets/b/need.c → pkg/u3/jets/b/need.c
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#include "jets/q.h"
#include "jets/w.h"

#include "noun.h"
#include "u3.h"


u3_noun
Expand Down
2 changes: 1 addition & 1 deletion pkg/noun/jets/b/reap.c → pkg/u3/jets/b/reap.c
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#include "jets/q.h"
#include "jets/w.h"

#include "noun.h"
#include "u3.h"


u3_noun
Expand Down
2 changes: 1 addition & 1 deletion pkg/noun/jets/b/reel.c → pkg/u3/jets/b/reel.c
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#include "jets/q.h"
#include "jets/w.h"

#include "noun.h"
#include "u3.h"

u3_noun
u3qb_reel(u3_noun a,
Expand Down
2 changes: 1 addition & 1 deletion pkg/noun/jets/b/roll.c → pkg/u3/jets/b/roll.c
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#include "jets/q.h"
#include "jets/w.h"

#include "noun.h"
#include "u3.h"

u3_noun
u3qb_roll(u3_noun a,
Expand Down
2 changes: 1 addition & 1 deletion pkg/noun/jets/b/scag.c → pkg/u3/jets/b/scag.c
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#include "jets/q.h"
#include "jets/w.h"

#include "noun.h"
#include "u3.h"

u3_noun
u3qb_scag(u3_atom a, u3_noun b)
Expand Down
2 changes: 1 addition & 1 deletion pkg/noun/jets/b/skid.c → pkg/u3/jets/b/skid.c
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#include "jets/q.h"
#include "jets/w.h"

#include "noun.h"
#include "u3.h"

u3_noun
u3qb_skid(u3_noun a, u3_noun b)
Expand Down
2 changes: 1 addition & 1 deletion pkg/noun/jets/b/skim.c → pkg/u3/jets/b/skim.c
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#include "jets/q.h"
#include "jets/w.h"

#include "noun.h"
#include "u3.h"

u3_noun
u3qb_skim(u3_noun a, u3_noun b)
Expand Down
2 changes: 1 addition & 1 deletion pkg/noun/jets/b/skip.c → pkg/u3/jets/b/skip.c
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#include "jets/q.h"
#include "jets/w.h"

#include "noun.h"
#include "u3.h"

u3_noun
u3qb_skip(u3_noun a, u3_noun b)
Expand Down
2 changes: 1 addition & 1 deletion pkg/noun/jets/b/slag.c → pkg/u3/jets/b/slag.c
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#include "jets/q.h"
#include "jets/w.h"

#include "noun.h"
#include "u3.h"


u3_noun
Expand Down
2 changes: 1 addition & 1 deletion pkg/noun/jets/b/snag.c → pkg/u3/jets/b/snag.c
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#include "jets/q.h"
#include "jets/w.h"

#include "noun.h"
#include "u3.h"


u3_noun
Expand Down
2 changes: 1 addition & 1 deletion pkg/noun/jets/b/sort.c → pkg/u3/jets/b/sort.c
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#include "jets/q.h"
#include "jets/w.h"

#include "noun.h"
#include "u3.h"


// like skid, except its callback is $-([* *] ?) and it takes the second
Expand Down
2 changes: 1 addition & 1 deletion pkg/noun/jets/b/turn.c → pkg/u3/jets/b/turn.c
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#include "jets/q.h"
#include "jets/w.h"

#include "noun.h"
#include "u3.h"

u3_noun
u3qb_turn(u3_noun a, u3_noun b)
Expand Down
Loading
Loading