fix services and add logs

This commit is contained in:
bQUARKz 2026-02-08 17:10:35 +00:00
parent 2592b1a1d1
commit e486c1980e
Signed by: bquarkz
SSH Key Fingerprint: SHA256:Z7dgqoglWwoK6j6u4QC87OveEq74WOhFN+gitsxtkf8
11 changed files with 328 additions and 26 deletions

View File

@ -42,6 +42,7 @@ pub enum NodeKind {
ImportSpec(ImportSpecNodeArena), ImportSpec(ImportSpecNodeArena),
ServiceDecl(ServiceDeclNodeArena), ServiceDecl(ServiceDeclNodeArena),
ServiceFnSig(ServiceFnSigNodeArena), ServiceFnSig(ServiceFnSigNodeArena),
ServiceFnDecl(ServiceFnDeclNodeArena),
FnDecl(FnDeclNodeArena), FnDecl(FnDeclNodeArena),
TypeDecl(TypeDeclNodeArena), TypeDecl(TypeDeclNodeArena),
TypeBody(TypeBodyNodeArena), TypeBody(TypeBodyNodeArena),
@ -104,6 +105,14 @@ pub struct ServiceFnSigNodeArena {
pub ret: NodeId, pub ret: NodeId,
} }
#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
pub struct ServiceFnDeclNodeArena {
pub name: NameId,
pub params: Vec<ParamNodeArena>,
pub ret: NodeId,
pub body: NodeId,
}
#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)] #[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
pub struct ParamNodeArena { pub struct ParamNodeArena {
pub span: Span, pub span: Span,

View File

@ -213,19 +213,21 @@ impl ContractRegistry {
}); });
mappings.insert("Fs".to_string(), fs); mappings.insert("Fs".to_string(), fs);
// Log mappings // Log mappings (host)
let mut log = HashMap::new(); let mut log = HashMap::new();
log.insert("write".to_string(), ContractMethod { log.insert("write".to_string(), ContractMethod {
id: 0x5001, id: 0x5001,
params: vec![PbsType::Int, PbsType::String], params: vec![PbsType::Int, PbsType::String],
return_type: PbsType::Void, // Alguns targets retornam status; para segurança, trate como Int para permitir POP automático
return_type: PbsType::Int,
}); });
log.insert("writeTag".to_string(), ContractMethod { log.insert("writeTag".to_string(), ContractMethod {
id: 0x5002, id: 0x5002,
params: vec![PbsType::Int, PbsType::Int, PbsType::String], params: vec![PbsType::Int, PbsType::Int, PbsType::String],
return_type: PbsType::Void, return_type: PbsType::Int,
}); });
mappings.insert("Log".to_string(), log); // O contrato host exposto no SDK é LogHost (não-público), então o registro deve atender por esse nome
mappings.insert("LogHost".to_string(), log);
// System mappings // System mappings
let mut system = HashMap::new(); let mut system = HashMap::new();

View File

@ -45,6 +45,17 @@ pub struct Lowerer<'a> {
} }
impl<'a> Lowerer<'a> { impl<'a> Lowerer<'a> {
#[inline]
fn hash_tag_u16(s: &str) -> u16 {
// FNV-1a 16-bit (simple, deterministic, allows small collisions)
let mut hash: u16 = 0x811C; // offset basis (truncated)
let prime: u16 = 0x0101; // 257
for &b in s.as_bytes() {
hash ^= b as u16;
hash = hash.wrapping_mul(prime);
}
hash
}
pub fn new( pub fn new(
arena: &'a AstArena, arena: &'a AstArena,
module_symbols: &'a ModuleSymbols, module_symbols: &'a ModuleSymbols,
@ -1123,15 +1134,71 @@ impl<'a> Lowerer<'a> {
.get(obj_id.name) .get(obj_id.name)
.or_else(|| self.imported_symbols.type_symbols.get(obj_id.name)); .or_else(|| self.imported_symbols.type_symbols.get(obj_id.name));
if let Some(sym) = sym_opt { if let Some(sym) = sym_opt {
if sym.kind == SymbolKind::Contract && sym.is_host { // 0) Açúcar sintático para Log: permitir quando Log for service/contract (não-host) também
// Lower arguments first to avoid borrowing conflicts if obj_name == "Log" {
for arg in &n.args { let level_opt: Option<u32> = match member_name {
self.lower_node(*arg)?; "trace" => Some(0),
"debug" => Some(1),
"info" => Some(2),
"warn" => Some(3),
"error" => Some(4),
_ => None,
};
if let Some(level) = level_opt {
if n.args.len() == 1 {
// Log.<lvl>(msg)
self.emit(InstrKind::PushBounded(level));
self.lower_node(n.args[0])?;
// Syscall 0x5001 retorna status (1 slot): descartar em ExprStmt
self.emit(InstrKind::HostCall(0x5001, 1));
self.emit(InstrKind::Pop);
return Ok(());
}
if n.args.len() == 2 {
if let NodeKind::StringLit(tag_node) = self.arena.kind(n.args[0]) {
let tag_hash = Self::hash_tag_u16(&tag_node.value) as u32;
self.emit(InstrKind::PushBounded(level));
self.emit(InstrKind::PushBounded(tag_hash));
self.lower_node(n.args[1])?;
// Syscall 0x5002 retorna status (1 slot): descartar em ExprStmt
self.emit(InstrKind::HostCall(0x5002, 1));
self.emit(InstrKind::Pop);
return Ok(());
} else {
self.error(
"E_LOWER_UNSUPPORTED",
format!("Log.{} com tag dinâmica ainda não é suportado; use tag string literal", member_name),
self.arena.span(node),
);
return Err(());
}
}
self.error(
"E_LOWER_UNSUPPORTED",
format!("Assinatura inválida para Log.{}", member_name),
self.arena.span(node),
);
return Err(());
} }
if let Some(method) = self.contract_registry.get_method(obj_name, member_name) { }
let id = method.id;
// Compute return slots from declared return type. Structs may span >1 slot (e.g., Button=4) if sym.kind == SymbolKind::Contract && sym.is_host {
let return_slots = match &method.return_type { // 1) Caminho padrão via ContractRegistry
if self.contract_registry.get_method(obj_name, member_name).is_some() {
// Extrai valores necessários sem manter o empréstimo do registry vivo
let (id, return_ty) = {
let method = self.contract_registry.get_method(obj_name, member_name).unwrap();
(method.id, method.return_type.clone())
};
// Lower arguments primeiro
for arg in &n.args {
self.lower_node(*arg)?;
}
// Compute return slots a partir do tipo retornado
let return_slots = match &return_ty {
PbsType::Void | PbsType::None => 0, PbsType::Void | PbsType::None => 0,
PbsType::Struct(name) => { PbsType::Struct(name) => {
// Prefer builtin struct slots, then fallback to struct_slots map, default 1 // Prefer builtin struct slots, then fallback to struct_slots map, default 1
@ -1142,9 +1209,12 @@ impl<'a> Lowerer<'a> {
self.get_type_slots(&ty) self.get_type_slots(&ty)
} }
}; };
self.emit(InstrKind::HostCall(id, return_slots)); self.emit(InstrKind::HostCall(id, return_slots));
return Ok(()); return Ok(());
} }
// (Açúcar de Log movido para antes do branch host)
} }
} }
} }
@ -2246,6 +2316,92 @@ mod tests {
assert!(instrs.iter().any(|i| matches!(i.kind, InstrKind::HostCall(0x5001, 0)))); assert!(instrs.iter().any(|i| matches!(i.kind, InstrKind::HostCall(0x5001, 0))));
} }
#[test]
fn test_log_sugar_lowering_basic() {
let code = "
declare contract Log host {}
fn main() {
Log.info(\"Hello\");
}
";
let mut interner = NameInterner::new();
let mut parser = Parser::new(code, FileId(0), &mut interner);
let parsed = parser.parse_file().expect("Failed to parse");
let mut collector = SymbolCollector::new(&interner);
let (type_symbols, value_symbols) = collector
.collect(&parsed.arena, parsed.root)
.expect("Failed to collect symbols");
let module_symbols = ModuleSymbols { type_symbols, value_symbols };
let imported = ModuleSymbols::new();
let lowerer = Lowerer::new(&parsed.arena, &module_symbols, &imported, &interner);
let program = lowerer.lower_file(parsed.root, "test").expect("Lowering failed");
let func = &program.modules[0].functions[0];
let instrs: Vec<_> = func.blocks.iter().flat_map(|b| b.instrs.iter()).collect();
// Deve gerar HostCall para Log.write (0x5001)
assert!(instrs.iter().any(|i| matches!(i.kind, InstrKind::HostCall(0x5001, 0))));
}
#[test]
fn test_log_sugar_lowering_with_tag_literal() {
let code = "
declare contract Log host {}
fn main() {
Log.warn(\"net\", \"Down\");
}
";
let mut interner = NameInterner::new();
let mut parser = Parser::new(code, FileId(0), &mut interner);
let parsed = parser.parse_file().expect("Failed to parse");
let mut collector = SymbolCollector::new(&interner);
let (type_symbols, value_symbols) = collector
.collect(&parsed.arena, parsed.root)
.expect("Failed to collect symbols");
let module_symbols = ModuleSymbols { type_symbols, value_symbols };
let imported = ModuleSymbols::new();
let lowerer = Lowerer::new(&parsed.arena, &module_symbols, &imported, &interner);
let program = lowerer.lower_file(parsed.root, "test").expect("Lowering failed");
let func = &program.modules[0].functions[0];
let instrs: Vec<_> = func.blocks.iter().flat_map(|b| b.instrs.iter()).collect();
// Deve gerar HostCall para Log.writeTag (0x5002)
assert!(instrs.iter().any(|i| matches!(i.kind, InstrKind::HostCall(0x5002, 0))));
}
#[test]
fn test_log_sugar_lowering_with_dynamic_tag_error() {
let code = "
declare contract Log host {}
fn main() {
let t = \"net\";
Log.debug(t, \"X\");
}
";
let mut interner = NameInterner::new();
let mut parser = Parser::new(code, FileId(0), &mut interner);
let parsed = parser.parse_file().expect("Failed to parse");
let mut collector = SymbolCollector::new(&interner);
let (type_symbols, value_symbols) = collector
.collect(&parsed.arena, parsed.root)
.expect("Failed to collect symbols");
let module_symbols = ModuleSymbols { type_symbols, value_symbols };
let imported = ModuleSymbols::new();
let lowerer = Lowerer::new(&parsed.arena, &module_symbols, &imported, &interner);
let result = lowerer.lower_file(parsed.root, "test");
assert!(result.is_err());
let bundle = result.err().unwrap();
assert!(bundle.diagnostics.iter().any(|d| d.code == "E_LOWER_UNSUPPORTED"));
}
#[test] #[test]
fn test_contract_call_without_host_lowering() { fn test_contract_call_without_host_lowering() {
let code = " let code = "

View File

@ -243,8 +243,14 @@ impl<'a> Parser<'a> {
self.consume(TokenKind::OpenBrace)?; self.consume(TokenKind::OpenBrace)?;
let mut members = Vec::new(); let mut members = Vec::new();
while self.peek().kind != TokenKind::CloseBrace && self.peek().kind != TokenKind::Eof { while self.peek().kind != TokenKind::CloseBrace && self.peek().kind != TokenKind::Eof {
// Ignora pontos-e-vírgula extras
if self.peek().kind == TokenKind::Semicolon {
self.advance();
continue;
}
members.push(self.parse_service_member()?); members.push(self.parse_service_member()?);
// Optional semicolon after signature // Opcional ';' após assinatura
if self.peek().kind == TokenKind::Semicolon { if self.peek().kind == TokenKind::Semicolon {
self.advance(); self.advance();
} }
@ -279,11 +285,21 @@ impl<'a> Parser<'a> {
) )
}; };
let span = Span::new(self.file_id, start_span.start, self.arena.span(ret).end); // Aceita tanto assinatura quanto corpo
Ok(self.arena.push( if self.peek().kind == TokenKind::OpenBrace {
NodeKind::ServiceFnSig(ServiceFnSigNodeArena { name, params, ret }), let body = self.parse_block()?;
span, let span = Span::new(self.file_id, start_span.start, self.arena.span(body).end);
)) Ok(self.arena.push(
NodeKind::ServiceFnDecl(ServiceFnDeclNodeArena { name, params, ret, body }),
span,
))
} else {
let span = Span::new(self.file_id, start_span.start, self.arena.span(ret).end);
Ok(self.arena.push(
NodeKind::ServiceFnSig(ServiceFnSigNodeArena { name, params, ret }),
span,
))
}
} }
fn parse_type_decl(&mut self, vis: Option<String>) -> Result<NodeId, DiagnosticBundle> { fn parse_type_decl(&mut self, vis: Option<String>) -> Result<NodeId, DiagnosticBundle> {

View File

@ -98,6 +98,9 @@ fn walk_node(
NodeKind::FnDecl(fn_decl) => { NodeKind::FnDecl(fn_decl) => {
walk_node(fn_decl.body, arena, module, index, imports, ref_index, node_to_symbol, diagnostics); walk_node(fn_decl.body, arena, module, index, imports, ref_index, node_to_symbol, diagnostics);
} }
NodeKind::ServiceFnDecl(_decl) => {
// Não resolve corpo/locais nesta fase (handled em resolver.rs)
}
NodeKind::Block(block) => { NodeKind::Block(block) => {
for &stmt in &block.stmts { for &stmt in &block.stmts {
walk_node(stmt, arena, module, index, imports, ref_index, node_to_symbol, diagnostics); walk_node(stmt, arena, module, index, imports, ref_index, node_to_symbol, diagnostics);

View File

@ -458,11 +458,33 @@ impl<'a> Resolver<'a> {
self.resolve_identifier(ext, arena.span(id), Namespace::Type); self.resolve_identifier(ext, arena.span(id), Namespace::Type);
} }
for member in &n.members { for member in &n.members {
if let NodeKind::ServiceFnSig(sig) = arena.kind(*member) { match arena.kind(*member) {
for param in &sig.params { NodeKind::ServiceFnSig(sig) => {
self.resolve_type_ref(arena, param.ty); for param in &sig.params {
self.resolve_type_ref(arena, param.ty);
}
self.resolve_type_ref(arena, sig.ret);
} }
self.resolve_type_ref(arena, sig.ret); NodeKind::ServiceFnDecl(decl) => {
// service com corpo: resolve tipos, define parâmetros como locais e resolve corpo
for param in &decl.params {
self.resolve_type_ref(arena, param.ty);
}
self.resolve_type_ref(arena, decl.ret);
self.enter_scope();
for param in &decl.params {
let sym_id = self.define_local(param.name, param.span.clone(), SymbolKind::Local);
if let Some(sym_id) = sym_id {
if let Some(ty_id) = self.resolve_type_ref(arena, param.ty) {
self.type_facts.set_symbol_type(sym_id, ty_id);
}
}
}
self.resolve_node(arena, decl.body);
self.exit_scope();
}
_ => {}
} }
} }
} }

View File

@ -203,6 +203,46 @@ impl<'a> TypeChecker<'a> {
self.check_fn_decl(arena, node, n); self.check_fn_decl(arena, node, n);
PbsType::Void PbsType::Void
} }
NodeKind::ServiceDecl(n) => {
// Verifica membros do service, incluindo funções com corpo
for m in &n.members {
match arena.kind(*m) {
NodeKind::ServiceFnSig(sig) => {
// Registrar tipo da função no contexto do service
let mut params = Vec::new();
for p in &sig.params {
params.push(self.resolve_type_node(arena, p.ty));
}
let ret_ty = self.resolve_type_node(arena, sig.ret);
// Não armazenamos tabela de métodos de service ainda; apenas validação superficial
let _ = (params, ret_ty);
}
NodeKind::ServiceFnDecl(decl) => {
// Checagem semelhante a FnDecl: escopo próprio, parâmetros locais e tipo de retorno
let mut params_tys = Vec::new();
for p in &decl.params {
params_tys.push(self.resolve_type_node(arena, p.ty));
}
let ret_ty = self.resolve_type_node(arena, decl.ret);
// Entra em escopo, define parâmetros e checa o corpo
self.enter_scope();
for (i, p) in decl.params.iter().enumerate() {
let ty = params_tys.get(i).cloned().unwrap_or(PbsType::Void);
self.define_local(self.interner.resolve(p.name), ty, false);
}
let prev_ret = self.current_return_type.clone();
self.current_return_type = Some(ret_ty.clone());
// Corpo do método do service é um Block; percorremos seus statements
self.check_node(arena, decl.body);
self.current_return_type = prev_ret;
self.exit_scope();
}
_ => {}
}
}
PbsType::Void
}
NodeKind::TypeDecl(n) => { NodeKind::TypeDecl(n) => {
self.check_type_decl(arena, node, n); self.check_type_decl(arena, node, n);
PbsType::Void PbsType::Void
@ -278,7 +318,8 @@ impl<'a> TypeChecker<'a> {
.or_else(|| self.imported_symbols.type_symbols.get(id.name)); .or_else(|| self.imported_symbols.type_symbols.get(id.name));
if let Some(sym) = sym_opt { if let Some(sym) = sym_opt {
if sym.kind == SymbolKind::Contract && sym.is_host { // Permitir consulta ao registry para contratos host (e também aceitar LogHost por nome)
if sym.kind == SymbolKind::Contract && (sym.is_host || name_str == "LogHost") {
// Check if the method exists in registry // Check if the method exists in registry
if let Some(method) = self.contract_registry.get_method(name_str, member_str) { if let Some(method) = self.contract_registry.get_method(name_str, member_str) {
return PbsType::Function { return PbsType::Function {

View File

@ -0,0 +1,48 @@
// Injeção pelo hardware
declare contract LogHost host {
fn write(level: int, msg: string): void;
fn writeTag(level: int, tag: int, msg: string): void;
}
// exposicao do modulo, com sugar sintatico, nada injetado aqui
pub service Log {
fn trace(msg: string): void {
LogHost.write(0, msg);
}
fn trace(tag: int, msg: string): void {
LogHost.writeTag(0, tag, msg);
}
fn debug(msg: string): void {
LogHost.write(1, msg);
}
fn debug(tag: int, msg: string): void {
LogHost.writeTag(1, tag, msg);
}
fn info(msg: string): void {
LogHost.write(2, msg);
}
fn info(tag: int, msg: string): void {
LogHost.writeTag(2, tag, msg);
}
fn warn(msg: string): void {
LogHost.write(3, msg);
}
fn warn(tag: int, msg: string): void {
LogHost.writeTag(3, tag, msg);
}
fn err(msg: string): void {
LogHost.write(4, msg);
}
fn err(tag: int, msg: string): void {
LogHost.writeTag(4, tag, msg);
}
}

View File

@ -1,5 +1,6 @@
import { Color, Gfx } from "@sdk:gfx"; import { Color, Gfx } from "@sdk:gfx";
import { Pad, Touch } from "@sdk:input"; import { Pad, Touch } from "@sdk:input";
import { Log } from "@sdk:log";
declare struct Vec2(x: int, y: int) declare struct Vec2(x: int, y: int)
[ [
@ -51,10 +52,14 @@ fn frame(): void {
} }
// 4. Input Snapshot & Nested Member Access // 4. Input Snapshot & Nested Member Access
let pad = Pad.a(); let pad_a = Pad.a();
let touch = Touch.finger(); let touch_f = Touch.finger();
let is_pressed = pad.down || touch.down; let is_pressed = pad_a.down || touch_f.down;
if is_pressed { if is_pressed {
Gfx.clear(Color.BLUE); Gfx.clear(Color.BLUE);
} }
if Pad.b().pressed {
Log.debug("B Pressed");
}
} }