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

WIP: [potigol] - implementação qual_tipo #528

Merged
merged 4 commits into from
Oct 29, 2023
Merged

WIP: [potigol] - implementação qual_tipo #528

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
57d964f
[potigol] - implementação qual_tipo
pablotdv Oct 17, 2023
430b663
[potigol] - adicionada interface para interpretador
pablotdv Oct 28, 2023
d813f33
Ajustes na resolução de QualTipo
samuelrvg Oct 29, 2023
99a2f56
remove only
samuelrvg Oct 29, 2023
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 .vscode/launch.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -724,7 +724,7 @@
"runtimeArgs": [
"--inspect-brk",
"${workspaceRoot}/node_modules/jest/bin/jest.js",
"potigol/interpretador.test.ts",
"potigol/avaliador-sintatico.test.ts",
"--runInBand"
],
"skipFiles": [
Expand Down
3 changes: 2 additions & 1 deletion fontes/avaliador-sintatico/dialetos/potigol/avaliador-sintatico-potigol.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -413,11 +413,12 @@ export class AvaliadorSintaticoPotigol extends AvaliadorSintaticoBase {
if (this.verificarTipoSimboloAtual(tiposDeSimbolos.QUAL_TIPO)) {
const identificador = this.simbolos[this.atual - 2];
const simbolo = this.simbolos[this.atual];
const valor = expressao ? expressao : identificador.lexema;
this.avancarEDevolverAnterior();
return new QualTipo(
this.hashArquivo,
simbolo,
identificador.lexema
valor
);
} else {
const nome = this.consumir(tiposDeSimbolos.IDENTIFICADOR, "Esperado nome do método após '.'.");
Expand Down
11 changes: 8 additions & 3 deletions fontes/interpretador/dialetos/potigol/interpretador-potigol.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { InterpretadorBase } from '../../interpretador-base';

import { registrarBibliotecaGlobalPotigol } from '../../../bibliotecas/dialetos/potigol/biblioteca-global';
import { AcessoMetodo, Binario, QualTipo, Unario, Variavel } from '../../../construtos';
import { AcessoMetodo, Binario, ConstanteOuVariavel, Literal, QualTipo, Unario, Variavel } from '../../../construtos';

import * as comum from './comum';
import { ObjetoPadrao } from '../../../estruturas';
Expand Down Expand Up @@ -59,11 +59,16 @@ export class InterpretadorPotigol extends InterpretadorBase implements Interpret
}

async visitarExpressaoQualTipo(expressao: QualTipo): Promise<string> {

let qualTipo = this.pilhaEscoposExecucao.topoDaPilha().ambiente.valores[expressao.valor].valor;
let qualTipo = expressao.valor;

if (expressao?.valor instanceof ConstanteOuVariavel) {
const nome = expressao?.valor.simbolo.lexema
qualTipo = this.pilhaEscoposExecucao.topoDaPilha().ambiente.valores[nome].valor
}

if (
qualTipo instanceof Binario ||
qualTipo instanceof Literal ||
qualTipo instanceof QualTipo ||
qualTipo instanceof Unario ||
qualTipo instanceof Variavel
Expand Down
2 changes: 1 addition & 1 deletion testes/potigol/avaliador-sintatico.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ describe('Avaliador sintático', () => {
expect(retornoAvaliadorSintatico.declaracoes).toHaveLength(1);
});

it('Sucesso - Operações encadeadas', () => {
it.only('Sucesso - Operações encadeadas', () => {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@samuelrvg esse it.only deveria continuar aqui?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@pablotdv Na branch principal esta normal, sem o .only pelo que ví aqui.

https://github.com/DesignLiquido/delegua/blob/449fb55ddeb245fb56c609184ee54e74226ef97d/testes/potigol/avaliador-sintatico.test.ts#L38C61-L38C61

const retornoLexador = lexador.mapear(['escreva (2 * 8) - (5 / 4 ^ 7)'], -1);
const retornoAvaliadorSintatico = avaliadorSintatico.analisar(retornoLexador, -1);

Expand Down
4 changes: 2 additions & 2 deletions testes/potigol/interpretador.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ describe('Interpretador', () => {
expect(retornoInterpretador.erros).toHaveLength(0);
});

it.skip('Dado um inteiro, escreva qual_tipo deve retornar Inteiro 2', async () => {
it('Dado um inteiro, escreva qual_tipo deve retornar Inteiro 2', async () => {
const retornoLexador = lexador.mapear([
'escreva(3.qual_tipo)'
], -1);
Expand Down Expand Up @@ -93,7 +93,7 @@ describe('Interpretador', () => {
expect(retornoInterpretador.erros).toHaveLength(0);
});

it.skip('Dado uma variável, escreva qual_tipo deve atribuir Inteiro', async () => {
it('Dado uma variável, escreva qual_tipo deve atribuir Inteiro', async () => {
const retornoLexador = lexador.mapear([
'a = 3.qual_tipo',
'escreva(a)'
Expand Down
Loading