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.

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

Jump to bottom

Wip frontend reset #3775

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

Wip frontend reset #3775

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
9d8b873
fe: remove LibraryFeature dependency on Types.resolved
michaellilltokiwa Sep 11, 2024
8bda6fe
Merge branch 'fe--remove-LibraryFeature-dependency-on-Types.resolved'…
michaellilltokiwa Sep 12, 2024
e1428ec
Merge branch 'fe--library-feature-current,-use-thisType-of-selfType' …
michaellilltokiwa Sep 12, 2024
e469239
wip
michaellilltokiwa Sep 12, 2024
f33972f
Merge branch 'main' into wip_frontend_reset
michaellilltokiwa Sep 13, 2024
1a036da
fe: fix module loading with correct universe and correct dependsOn
michaellilltokiwa Sep 13, 2024
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
1 change: 0 additions & 1 deletion src/dev/flang/air/Clazz.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,6 @@ public boolean action(AbstractMatch m, AbstractCase c)
{
var ac = actualClazzes(sc, null);
var innerClazz = ac[0];
var T = innerClazz.actualGenerics()[0];
var cf = innerClazz.feature();
if (CHECKS) check
(cf == Types.resolved.f_Type_infix_colon_true ||
Expand Down
9 changes: 7 additions & 2 deletions src/dev/flang/ast/AbstractType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1313,7 +1313,9 @@ public int compareToIgnoreOuter(AbstractType other)
if (PRECONDITIONS) require
(checkedForGeneric(),
other != null,
other.checkedForGeneric());
other.checkedForGeneric(),
!(this instanceof UnresolvedType),
!(other instanceof UnresolvedType));

int result = 0;

Expand Down Expand Up @@ -1561,10 +1563,13 @@ AbstractType typeType(Resolution res)
var g = new List<AbstractType>(this);
g.addAll(generics());

var tf = res != null ? fot.typeFeature(res) : fot.typeFeature();
if (CHECKS) check
(tf != null);
result = ResolvedNormalType.create(g,
g,
outer().typeType(res),
res != null ? fot.typeFeature(res) : fot.typeFeature());
tf);
}
return result;
}
Expand Down
93 changes: 93 additions & 0 deletions src/dev/flang/ast/Types.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,6 +298,99 @@ public Resolved(SrcModule mod, CreateType ct, AbstractFeature universe)
res.resolveTypes(t.feature());
}
}
public static interface LookupFeature
{
AbstractFeature lookup(AbstractFeature target, FeatureName fn);
}
public Resolved(LookupFeature lf, AbstractFeature universe)
{
this.universe = universe;
t_i8 = lookup(lf, "i8", 1).selfType();
t_i16 = lookup(lf, "i16", 1).selfType();
t_i32 = lookup(lf, "i32", 1).selfType();
t_i64 = lookup(lf, "i64", 1).selfType();
t_u8 = lookup(lf, "u8", 1).selfType();
t_u16 = lookup(lf, "u16", 1).selfType();
t_u32 = lookup(lf, "u32", 1).selfType();
t_u64 = lookup(lf, "u64", 1).selfType();
t_f32 = lookup(lf, "f32", 1).selfType();
t_f64 = lookup(lf, "f64", 1).selfType();
t_bool = lookup(lf, "bool", 0).selfType();
t_fuzion = lookup(lf, "fuzion", 0).selfType();
t_String = lookup(lf, FuzionConstants.STRING_NAME, 0).selfType();
t_Const_String = lookup(lf, "Const_String", 0).selfType();
t_Any = lookup(lf, FuzionConstants.ANY_NAME, 0).selfType();
t_unit = lookup(lf, FuzionConstants.UNIT_NAME, 0).selfType();
t_void = lookup(lf, "void", 0).selfType();
t_codepoint = lookup(lf, "codepoint", 1).selfType();
f_id = lookup(lf, "id", 2);
f_void = lookup(lf, "void", 0);
f_choice = lookup(lf, "choice", 1);
f_TRUE = lookup(lf, "TRUE", 0);
f_FALSE = lookup(lf, "FALSE", 0);
f_true = lookup(lf, "true", 0);
f_false = lookup(lf, "false", 0);
f_bool = lookup(lf, "bool", 0);
f_bool_NOT = null;
f_bool_AND = null;
f_bool_OR = null;
f_bool_IMPLIES = null;
f_bool_TERNARY = null;
f_Const_String_utf8_data = lookup(lf, lookup(lf, "Const_String", 0), "utf8_data", 0);
f_debug = lookup(lf, "debug", 0);
f_debug_level = lookup(lf, "debug_level", 0);
f_Function = lookup(lf, FUNCTION_NAME, 2);
f_Function_call = lookup(lf, f_Function, "call", 1);
f_safety = lookup(lf, "safety", 0);
f_array = lookup(lf, "array", 5);
f_array_internal_array = lookup(lf, f_array, "internal_array", 0);
f_error = lookup(lf, "error", 1);
f_error_msg = lookup(lf, f_error, "msg", 0);
f_fuzion = lookup(lf, "fuzion", 0);
f_fuzion_java = lookup(lf, f_fuzion, "java", 0);
f_fuzion_Java_Object = lookup(lf, f_fuzion_java, "Java_Object", 1);
f_fuzion_Java_Object_Ref = lookup(lf, f_fuzion_Java_Object, "Java_Ref", 0);
f_fuzion_sys = lookup(lf, f_fuzion, "sys", 0);
f_fuzion_sys_array = lookup(lf, f_fuzion_sys, "internal_array", 3);
f_fuzion_sys_array_data = lookup(lf, f_fuzion_sys_array, "data", 0);
f_fuzion_sys_array_length = lookup(lf, f_fuzion_sys_array, "length", 0);
f_concur = lookup(lf, "concur", 0);
f_concur_atomic = lookup(lf, f_concur, "atomic", 2);
f_concur_atomic_v = lookup(lf, f_concur_atomic, "v", 0);
f_Type = lookup(lf, "Type", 0);
f_Type_infix_colon = lookup(lf, f_Type, "infix :", 1);
f_Type_infix_colon_true = lookup(lf, f_Type, "infix_colon_true", 1);
f_Type_infix_colon_false = lookup(lf, f_Type, "infix_colon_false", 1);
f_type_as_value = lookup(lf, "type_as_value", 1);
f_Lazy = lookup(lf, LAZY_NAME, 1);
f_Unary = lookup(lf, UNARY_NAME, 2);
f_auto_unwrap = lookup(lf, "auto_unwrap", 2);
resolved = this;
numericTypes = new TreeSet<AbstractType>(new List<>(
t_i8,
t_i16,
t_i32,
t_i64,
t_u8,
t_u16,
t_u32,
t_u64,
t_f32,
t_f64));
((ArtificialBuiltInType) t_ADDRESS ).resolveArtificialType(lookup(lf, FuzionConstants.ANY_NAME, 0));
((ArtificialBuiltInType) t_UNDEFINED).resolveArtificialType(universe);
((ArtificialBuiltInType) t_ERROR ).resolveArtificialType(f_ERROR);
}
private AbstractFeature lookup(LookupFeature lf, AbstractFeature target, String name, int argCount)
{
var result = lf.lookup(target, FeatureName.get(name, argCount));
check(result != null);
return result;
}
private AbstractFeature lookup(LookupFeature lf, String name, int argCount)
{
return lookup(lf, universe, name, argCount);
}
}


Expand Down
Loading
Loading