ParkerTenBroeck/automata
1
0
Fork 0
mirror of https://github.com/ParkerTenBroeck/automata.git synced 2026-06-07 05:28:45 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'main' into gh-pages

Browse source
This commit is contained in:
ParkerTenBroeck 2026-01-11 22:26:56 -05:00
commit a1ac3323c4
14 changed files with 1062 additions and 617 deletions
Download patch file Download diff file Expand all files Collapse all files

29
automata/src/automatan/fa.rs
View file

@ -3,11 +3,13 @@ use std::collections::HashSet;
use super::*;
use crate::{
delta_lower, dual_struct_serde, epsilon, loader::{
delta_lower, dual_struct_serde, epsilon,
loader::{
Context, INITIAL_STATE, Spanned,
ast::{self, Symbol as Sym, TopLevel},
log::LogSink,
}, sigma_upper
},
sigma_upper,
};
dual_struct_serde! {
@ -104,6 +106,12 @@ impl<'a, 'b> FaCompiler<'a, 'b> {
self.compile_top_level(element, span);
}
if self.states_def.is_none() {
self.ctx
.emit_error_locless("states never defined")
.emit_help_logless("add: Q = {...}");
}
if self.alphabet_def.is_none() {
self.ctx
.emit_error_locless("alphabet never defined")
@ -111,12 +119,6 @@ impl<'a, 'b> FaCompiler<'a, 'b> {
.emit_info_logless(concat!("E can be ", sigma_upper!(str)));
}
if self.states_def.is_none() {
self.ctx
.emit_error_locless("states never defined")
.emit_help_logless("add: Q = {...}");
}
if self.final_states_def.is_none() {
self.ctx
.emit_error_locless("final states never defined")
@ -139,9 +141,12 @@ impl<'a, 'b> FaCompiler<'a, 'b> {
}
};
if self.transitions.is_empty(){
self.ctx.emit_warning_locless("no transitions defined")
.emit_help_logless("consider defining one: d(state, letter|epsilon) = state | {state, state, ...}")
if self.transitions.is_empty() {
self.ctx
.emit_warning_locless("no transitions defined")
.emit_help_logless(
"consider defining one: d(state, letter|epsilon) = state | {state, ...}",
)
.emit_info_logless(concat!("d can be ", delta_lower!(str)))
.emit_info_logless(concat!("epsilon can be ", epsilon!(str)));
}
@ -168,7 +173,7 @@ impl<'a, 'b> FaCompiler<'a, 'b> {
TL::Item(S("F", _), list) => self.compile_final_states(list, span),
TL::Item(S(INITIAL_STATE, _), item) => self.compile_initial_state(item, span),
TL::Item(S(name, dest_s), _) => {
self.ctx.emit_error(format!("unknown item {name:?}, expected states, alphabet, final states, initial state"), dest_s);
self.ctx.emit_error(format!("unknown item {name:?}, expected states | alphabet | final states | initial state"), dest_s);
}
TL::TransitionFunc(S((S(delta_lower!(pat), _), args), _), list) => {

19
automata/src/automatan/mod.rs
View file

@ -6,7 +6,6 @@ pub mod fa;
pub mod pda;
pub mod tm;
#[derive(Clone, Copy, Debug)]
pub struct Options {
pub non_deterministic: bool,
@ -14,15 +13,27 @@ pub struct Options {
}
#[derive(Debug, PartialEq, Eq, Clone, Copy, Hash)]
#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize), serde(transparent))]
#[cfg_attr(
feature = "serde",
derive(serde::Serialize, serde::Deserialize),
serde(transparent)
)]
pub struct State<'a>(pub &'a str);
#[derive(Debug, PartialEq, Eq, Clone, Copy, Hash)]
#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize), serde(transparent))]
#[cfg_attr(
feature = "serde",
derive(serde::Serialize, serde::Deserialize),
serde(transparent)
)]
pub struct Symbol<'a>(pub &'a str);
#[derive(Debug, PartialEq, Eq, Clone, Copy, Hash)]
#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize), serde(transparent))]
#[cfg_attr(
feature = "serde",
derive(serde::Serialize, serde::Deserialize),
serde(transparent)
)]
pub struct Letter<'a>(pub &'a str);
#[derive(Clone, Debug)]

625
automata/src/automatan/pda.rs
View file

@ -2,234 +2,512 @@ use std::collections::HashSet;
use super::*;
use crate::{delta_lower, gamma_upper, loader::{
Context, INITIAL_STACK, INITIAL_STATE, Spanned, ast::{self, Symbol as Sym}, log::LogSink
}, sigma_upper};
use crate::{
delta_lower, dual_struct_serde, epsilon, gamma_upper,
loader::{
Context, INITIAL_STACK, INITIAL_STATE, Spanned,
ast::{self, Symbol as Sym},
log::LogSink,
},
sigma_upper,
};
#[derive(Debug, PartialEq, Eq, Clone, Copy, Hash)]
#[cfg_attr(feature = "serde", derive(serde::Serialize))]
pub struct TransitionFrom<'a> {
dual_struct_serde! {
#[derive(Debug, PartialEq, Eq, Clone, Hash)]
pub struct TransitionFrom<'a> {
#[serde(borrow)]
pub state: State<'a>,
#[serde(borrow)]
pub letter: Option<Letter<'a>>,
#[serde(borrow)]
pub symbol: Symbol<'a>,
}
}
#[derive(Debug, PartialEq, Eq, Clone, Hash)]
#[cfg_attr(feature = "serde", derive(serde::Serialize))]
pub struct TransitionTo<'a> {
dual_struct_serde! {
#[derive(Debug, PartialEq, Eq, Clone, Hash)]
pub struct TransitionTo<'a> {
#[serde(borrow)]
pub state: State<'a>,
#[serde(borrow)]
pub stack: Vec<Symbol<'a>>,
pub transition: Span,
pub function: Span,
}
}
#[derive(Clone, Debug)]
#[allow(unused)]
#[cfg_attr(feature = "serde", serde_with::serde_as)]
#[cfg_attr(feature = "serde", derive(serde::Serialize))]
pub struct Pda<'a> {
dual_struct_serde! { {#[serde_with::serde_as]}
#[derive(Clone, Debug)]
pub struct Pda<'a> {
#[serde(borrow)]
pub initial_state: State<'a>,
#[serde(borrow)]
pub initial_stack: Symbol<'a>,
#[serde(borrow)]
pub states: HashMap<State<'a>, StateInfo>,
#[serde(borrow)]
pub symbols: HashMap<Symbol<'a>, SymbolInfo>,
#[serde(borrow)]
pub alphabet: HashMap<Letter<'a>, LetterInfo>,
#[serde(borrow)]
pub final_states: Option<HashMap<State<'a>, StateInfo>>,
#[cfg(feature = "serde")]
#[serde(borrow)]
#[serde_as(as = "serde_with::Seq<(_, _)>")]
pub transitions: HashMap<TransitionFrom<'a>, HashSet<TransitionTo<'a>>>,
}
}
#[cfg(not(feature = "serde"))]
pub transitions: HashMap<TransitionFrom<'a>, HashSet<TransitionTo<'a>>>,
#[derive(Clone, Copy)]
enum AcceptBy {
EmptyStack,
FinalState,
}
pub struct PdaCompiler<'a, 'b> {
ctx: &'b mut Context<'a>,
options: Options,
initial_state: Option<(State<'a>, Span)>,
initial_stack: Option<(Symbol<'a>, Span)>,
accept_by: Option<(AcceptBy, Span)>,
states: HashMap<State<'a>, StateInfo>,
states_def: Option<Span>,
symbols: HashMap<Symbol<'a>, SymbolInfo>,
symbols_def: Option<Span>,
alphabet: HashMap<Letter<'a>, LetterInfo>,
alphabet_def: Option<Span>,
final_states: HashMap<State<'a>, StateInfo>,
final_states_def: Option<Span>,
transitions: HashMap<TransitionFrom<'a>, HashSet<TransitionTo<'a>>>,
}
impl<'a> Pda<'a> {
pub fn parse(
pub fn compile(
items: impl Iterator<Item = Spanned<ast::TopLevel<'a>>>,
ctx: &mut Context<'a>,
options: Options,
) -> Option<Pda<'a>> {
let mut initial_state = None;
let mut initial_stack = None;
PdaCompiler::new(ctx, options).compile(items)
}
}
let mut states = HashMap::new();
let mut symbols = HashMap::new();
let mut alphabet = HashMap::new();
let mut final_states = None;
macro_rules! accept_empty {
($ident: ident) => {
$crate::maker!($ident: "N","n","null","empty","E","Z0","z0")
};
}
let mut transitions: HashMap<TransitionFrom<'a>, HashSet<TransitionTo<'a>>> =
HashMap::new();
macro_rules! accept_final {
($ident: ident) => {
$crate::maker!($ident: "F","final")
};
}
impl<'a, 'b> PdaCompiler<'a, 'b> {
pub fn new(ctx: &'b mut Context<'a>, options: Options) -> Self {
Self {
ctx,
options,
initial_state: Default::default(),
initial_stack: Default::default(),
accept_by: Default::default(),
states: Default::default(),
states_def: Default::default(),
symbols: Default::default(),
symbols_def: Default::default(),
alphabet: Default::default(),
alphabet_def: Default::default(),
final_states: Default::default(),
final_states_def: Default::default(),
transitions: Default::default(),
}
}
pub fn compile(
mut self,
items: impl Iterator<Item = Spanned<ast::TopLevel<'a>>>,
) -> Option<Pda<'a>> {
for Spanned(element, span) in items {
self.compile_top_level(element, span);
}
if self.states_def.is_none() {
self.ctx
.emit_error_locless("states never defined")
.emit_help_logless("add: Q = {...}");
}
if self.alphabet_def.is_none() {
self.ctx
.emit_error_locless("alphabet never defined")
.emit_help_logless("add: E = {...}")
.emit_info_logless(concat!("E can be ", sigma_upper!(str)));
}
if self.symbols_def.is_none() {
self.ctx
.emit_error_locless("stack symbols never defined")
.emit_help_logless("add: G = {...}")
.emit_info_logless(concat!("G can be ", gamma_upper!(str)));
}
if self.accept_by.is_none() {
self.ctx
.emit_error_locless("accept by never defined")
.emit_help_logless("add: accept = N|F")
.emit_info_logless(concat!(
"accept by empty stack N can be ",
accept_empty!(str)
))
.emit_info_logless(concat!(
"accept by final state F can be ",
accept_final!(str)
));
}
if self.final_states_def.is_none()
&& matches!(self.accept_by, Some((AcceptBy::FinalState, _)))
{
self.ctx
.emit_error_locless("final states never defined")
.emit_help_logless("add: F = {...}");
}else if let (Some((AcceptBy::EmptyStack, empty)), Some(states)) = (self.accept_by, self.final_states_def){
self.ctx
.emit_error_locless("final states defined alongside accept by empty stack")
.emit_help("either remote to accept by empty stack", states)
.emit_help("or remote to accept by final state", empty);
}
let initial_state = match self.initial_state {
Some(some) => some.0,
None => {
if self.states.contains_key(&State("q0")) {
self.ctx
.emit_warning_locless("initial state not defined, defaulting to 'q0'")
.emit_help_logless(format!("add: {INITIAL_STATE} = q0"));
} else {
self.ctx
.emit_error_locless("initial state not defined")
.emit_help_logless(format!("add: {INITIAL_STATE} = ..."));
}
State("q0")
}
};
let initial_stack = match self.initial_stack {
Some(some) => some.0,
None => {
if self.symbols.contains_key(&Symbol("Z0")) {
self.ctx
.emit_warning_locless(
"initial stack symbol not defined, defaulting to 'Z0'",
)
.emit_help_logless(format!("add: {INITIAL_STACK} = Z0"));
} else {
self.ctx
.emit_error_locless("initial stack symbol not defined")
.emit_help_logless(format!("add: {INITIAL_STACK} = ..."));
}
Symbol("Z0")
}
};
if self.transitions.is_empty() {
self.ctx
.emit_warning_locless("no transitions defined")
.emit_help_logless(
"consider defining one: d(state, letter|epsilon, symbol) = (state, [symbol]) | {(state, [symbol]), ...}",
)
.emit_info_logless(concat!("d can be ", delta_lower!(str)))
.emit_info_logless(concat!("epsilon can be ", epsilon!(str)));
}
if self.ctx.contains_errors() {
return None;
}
let final_states =
matches!(self.accept_by, Some((AcceptBy::FinalState, _))).then_some(self.final_states);
Some(Pda {
initial_state,
initial_stack,
states: self.states,
symbols: self.symbols,
alphabet: self.alphabet,
final_states,
transitions: self.transitions,
})
}
fn compile_top_level(&mut self, element: ast::TopLevel<'a>, span: Span) {
use Spanned as S;
use ast::TopLevel as TL;
match element {
TL::Item(S("Q", _), list) => {
if !states.is_empty() {
ctx.emit_error("states already set", span);
TL::Item(S("accept", _), item) => self.compile_accept_by(item, span),
TL::Item(S("Q", _), list) => self.compile_states(list, span),
TL::Item(S(gamma_upper!(pat), _), list) => self.compile_symbols(list, span),
TL::Item(S(sigma_upper!(pat), _), list) => self.compile_alphabet(list, span),
TL::Item(S("F", _), list) => self.compile_final_states(list, span),
TL::Item(S(INITIAL_STATE, _), item) => self.compile_initial_state(item, span),
TL::Item(S(INITIAL_STACK, _), item) => self.compile_initial_stack(item, span),
TL::Item(S(name, dest_s), _) => {
self.ctx.emit_error(format!("unknown item {name:?}, expected states | stack symbols | alphabet | accept by | final states | initial state | initial stack"), dest_s);
}
let Some(list) = list.expect_set(ctx) else {
continue;
TL::TransitionFunc(S((S(delta_lower!(pat), _), args), _), list) => {
self.compile_transition_function(args, list)
}
TL::TransitionFunc(S((S(name, _), _), dest_s), _) => {
self.ctx.emit_error(
format!(
"unknown function {name:?}, expected transition function ( {} )",
delta_lower!(str)
),
dest_s,
);
}
TL::ProductionRule(_, _) => {
self.ctx.emit_error("unexpected production rule", span);
}
TL::Table() => _ = self.ctx.emit_error("unexpected table", span),
}
}
fn compile_accept_by(&mut self, item: Spanned<ast::Item<'a>>, top_level: Span) {
if let Some((_, previous)) = self.accept_by {
self.ctx
.emit_error("accept by already set", top_level)
.emit_info("previously defined here", previous);
}
let Some(by) = item.expect_ident(self.ctx) else {
return;
};
let by = match by {
accept_empty!(pat) => AcceptBy::EmptyStack,
accept_final!(pat) => AcceptBy::FinalState,
_ => {
self.ctx.emit_error("invalid accept by", item.1);
return;
}
};
self.accept_by = Some((by, top_level));
}
fn compile_states(&mut self, list: Spanned<ast::Item<'a>>, top_level: Span) {
if let Some(previous) = self.states_def {
self.ctx
.emit_error("states already set", top_level)
.emit_info("previously defined here", previous);
}
let Some(list) = list.expect_set(self.ctx) else {
return;
};
for item in list {
let Some(ident) = item.expect_ident(ctx) else {
let Some(ident) = item.expect_ident(self.ctx) else {
continue;
};
if states
if let Some(previous) = self
.states
.insert(State(ident), StateInfo { definition: item.1 })
.is_some()
{
ctx.emit_error("state redefined", item.1);
self.ctx
.emit_error("state redefined", item.1)
.emit_info("previously defined here", previous.definition);
}
}
if list.is_empty() {
ctx.emit_error("states cannot be empty", span);
self.ctx.emit_error("states cannot be empty", top_level);
}
self.states_def = Some(top_level);
}
TL::Item(S(sigma_upper!(pat), _), list) => {
if !alphabet.is_empty() {
ctx.emit_error("alphabet already set", span);
fn compile_symbols(&mut self, list: Spanned<ast::Item<'a>>, top_level: Span) {
if let Some(previous) = self.symbols_def {
self.ctx
.emit_error("stack symbols already set", top_level)
.emit_info("previously defined here", previous);
}
let Some(list) = list.expect_set(ctx) else {
continue;
let Some(list) = list.expect_set(self.ctx) else {
return;
};
for item in list {
let Some(ident) = item.expect_ident(ctx) else {
let Some(ident) = item.expect_ident(self.ctx) else {
continue;
};
if let Some(previous) = self
.symbols
.insert(Symbol(ident), SymbolInfo { definition: item.1 })
{
self.ctx
.emit_error("stack symbol redefined", item.1)
.emit_info("previously defined here", previous.definition);
}
}
if list.is_empty() {
self.ctx.emit_error("states cannot be empty", top_level);
}
self.symbols_def = Some(top_level);
}
fn compile_alphabet(&mut self, list: Spanned<ast::Item<'a>>, top_level: Span) {
if let Some(previous) = self.alphabet_def {
self.ctx
.emit_error("alphabet already set", top_level)
.emit_info("previously defined here", previous);
}
let Some(list) = list.expect_set(self.ctx) else {
return;
};
for item in list {
let Some(ident) = item.expect_ident(self.ctx) else {
continue;
};
if ident.chars().count() != 1 {
ctx.emit_error("letter cannot be longer than one char", item.1);
self.ctx
.emit_error("letter cannot be longer than one char", item.1);
}
if alphabet
if let Some(previous) = self
.alphabet
.insert(Letter(ident), LetterInfo { definition: item.1 })
.is_some()
{
ctx.emit_error("letter redefined", item.1);
self.ctx
.emit_error("letter redefined", item.1)
.emit_help("previously defined here", previous.definition);
}
}
if list.is_empty() {
ctx.emit_error("alphabet cannot be empty", span);
self.ctx.emit_error("alphabet cannot be empty", top_level);
}
self.alphabet_def = Some(top_level);
}
TL::Item(S("F", _), list) => {
if final_states.is_some() {
ctx.emit_error("final states already set", span);
fn compile_final_states(&mut self, list: Spanned<ast::Item<'a>>, top_level: Span) {
if let Some(previous) = self.final_states_def {
self.ctx
.emit_error("final states already set", top_level)
.emit_help("previously defined here", previous);
}
let mut map = HashMap::new();
let Some(list) = list.expect_set(ctx) else {
continue;
let Some(list) = list.expect_set(self.ctx) else {
return;
};
for item in list {
let Some(ident) = item.expect_ident(ctx) else {
let Some(ident) = item.expect_ident(self.ctx) else {
continue;
};
if states.contains_key(&State(ident)) {
if map
if self.states.contains_key(&State(ident)) {
if self
.final_states
.insert(State(ident), StateInfo { definition: item.1 })
.is_some()
{
ctx.emit_error("final state redefined", item.1);
self.ctx.emit_error("final state redefined", item.1);
}
} else {
ctx.emit_error("final state not defined in set of states", item.1);
self.ctx
.emit_error("final state not defined in set of states", item.1);
}
}
final_states = Some(map);
}
TL::Item(S(gamma_upper!(pat), _), list) => {
if !symbols.is_empty() {
ctx.emit_error("stack symbols already set", span);
}
let Some(list) = list.expect_set(ctx) else {
continue;
};
for item in list {
let Some(ident) = item.expect_ident(ctx) else {
continue;
};
if symbols
.insert(Symbol(ident), SymbolInfo { definition: item.1 })
.is_some()
{
ctx.emit_error("stack symbol redefined", item.1);
}
self.final_states_def = Some(top_level);
}
if list.is_empty() {
ctx.emit_error("stack symbols cannot be empty", span);
}
}
TL::Item(S(INITIAL_STATE, _), S(src, src_d)) => match src {
fn compile_initial_state(
&mut self,
Spanned(src, src_d): Spanned<ast::Item<'a>>,
top_level: Span,
) {
match src {
ast::Item::Symbol(Sym::Ident(ident)) => {
if initial_state.is_some() {
ctx.emit_error("initial state already set", span);
if let Some((_, previous)) = self.initial_state {
self.ctx
.emit_error("initial state already set", top_level)
.emit_help("previously defined here", previous);
}
if states.contains_key(&State(ident)) {
initial_state = Some(State(ident))
if self.states.contains_key(&State(ident)) {
self.initial_state = Some((State(ident), top_level))
} else {
ctx.emit_error("initial state symbol not defined as a state", src_d);
self.ctx
.emit_error("initial state symbol not defined as a state", src_d);
}
}
_ => _ = ctx.emit_error("expected ident", src_d),
},
TL::Item(S(INITIAL_STACK, _), S(src, src_d)) => match src {
ast::Item::Symbol(Sym::Ident(ident)) => {
if initial_stack.is_some() {
ctx.emit_error("initial stack already set", span);
_ => _ = self.ctx.emit_error("expected ident", src_d),
}
if symbols.contains_key(&Symbol(ident)) {
initial_stack = Some(Symbol(ident));
} else {
ctx.emit_error(
"initial stack symbol not defined as a stack symbol",
src_d,
);
}
}
_ => _ = ctx.emit_error("expected ident", src_d),
},
TL::Item(S(name, dest_s), _) => {
ctx.emit_error(format!("unknown item {name:?}, expected states, alphabet, symbols, final states, initial state, initial stack"), dest_s);
}
TL::TransitionFunc(S((S(delta_lower!(pat), _), tuple), _), list) => {
fn compile_initial_stack(
&mut self,
Spanned(src, src_d): Spanned<ast::Item<'a>>,
top_level: Span,
) {
match src {
ast::Item::Symbol(Sym::Ident(ident)) => {
if let Some((_, previous)) = self.initial_stack {
self.ctx
.emit_error("initial stack symbol already set", top_level)
.emit_help("previously defined here", previous);
}
if self.symbols.contains_key(&Symbol(ident)) {
self.initial_stack = Some((Symbol(ident), top_level))
} else {
self.ctx
.emit_error("initial stack symbol not defined as a state", src_d);
}
}
_ => _ = self.ctx.emit_error("expected ident", src_d),
}
}
fn compile_transition_function(
&mut self,
args: Spanned<ast::Tuple<'a>>,
list: Spanned<ast::Item<'a>>,
) {
let list = list.set_weak();
let Some((state, letter, stack_symbol)) =
tuple.as_ref().expect_pda_transition_function(ctx)
args.as_ref().expect_pda_transition_function(self.ctx)
else {
continue;
return;
};
if !states.contains_key(&State(state.0)) {
ctx.emit_error("transition state not defined as state", state.1);
continue;
if !self.states.contains_key(&State(state.0)) {
self.ctx
.emit_error("transition state not defined as state", state.1);
return;
};
if !symbols.contains_key(&Symbol(stack_symbol.0)) {
ctx.emit_error(
if !self.symbols.contains_key(&Symbol(stack_symbol.0)) {
self.ctx.emit_error(
"transition stack symbol not defined as stack symbol",
stack_symbol.1,
);
continue;
return;
};
let letter: Option<Letter<'_>> = match letter.0 {
Sym::Epsilon(_) => {
if !options.epsilon_moves {
ctx.emit_error("epsilon moves not permitted", letter.1);
if !self.options.epsilon_moves {
self.ctx.emit_error("epsilon moves not permitted", letter.1);
}
None
}
Sym::Ident(val) => {
if !alphabet.contains_key(&Letter(val)) {
ctx.emit_error(
"transition letter not defined in alphabet",
letter.1,
);
if !self.alphabet.contains_key(&Letter(val)) {
self.ctx
.emit_error("transition letter not defined in alphabet", letter.1);
}
Some(Letter(val))
}
@ -237,14 +515,15 @@ impl<'a> Pda<'a> {
for item in list {
let Some((next_state, stack)) = item
.expect_tuple(ctx)
.and_then(|item| item.expect_pda_transition(ctx))
.expect_tuple(self.ctx)
.and_then(|item| item.expect_pda_transition(self.ctx))
else {
continue;
};
if !states.contains_key(&State(next_state.0)) {
ctx.emit_error("transition state not defined as state", next_state.1);
if !self.states.contains_key(&State(next_state.0)) {
self.ctx
.emit_error("transition state not defined as state", next_state.1);
continue;
};
@ -255,105 +534,39 @@ impl<'a> Pda<'a> {
if matches!(symbol.0, ast::Item::Symbol(Sym::Epsilon(_))) {
return None;
}
let ident = symbol.expect_ident(ctx)?;
let ident = symbol.expect_ident(self.ctx)?;
if !symbols.contains_key(&Symbol(ident)) {
ctx.emit_error("transition stack symbol not defined", symbol.1);
if !self.symbols.contains_key(&Symbol(ident)) {
self.ctx
.emit_error("transition stack symbol not defined", symbol.1);
return None;
};
Some(Symbol(ident))
})
.collect();
let entry: &mut _ = transitions
let entry: &mut _ = self
.transitions
.entry(TransitionFrom {
letter,
state: State(state.0),
symbol: Symbol(stack_symbol.0),
})
.or_default();
if !entry.is_empty() && !options.non_deterministic {
ctx.emit_error("transition already defined for this starting point (non determinism not permitted)", item.1);
if !entry.is_empty() && !self.options.non_deterministic {
self.ctx.emit_error("transition already defined for this starting point (non determinism not permitted)", item.1);
}
if !entry.insert(TransitionTo {
state: State(next_state.0),
stack,
function: tuple.1,
function: args.1,
transition: item.1,
}) {
ctx.emit_warning("duplicate transition", item.1);
self.ctx.emit_warning("duplicate transition", item.1);
}
}
}
TL::TransitionFunc(S((S(name, _), _), dest_s), _) => {
ctx.emit_error(
format!(
"unknown function {name:?}, expected transition function ( {} )", delta_lower!(str)
),
dest_s,
);
}
TL::ProductionRule(_, _) => {
ctx.emit_error("unexpected production rule", span);
}
TL::Table() => _ = ctx.emit_error("unexpected table", span),
}
}
if symbols.is_empty() {
ctx.emit_error_locless("stack symbols never defined");
}
if alphabet.is_empty() {
ctx.emit_error_locless("alphabet never defined");
}
if states.is_empty() {
ctx.emit_error_locless("states never defined");
}
let initial_stack = match initial_stack {
Some(some) => some,
None => {
if symbols.contains_key(&Symbol("Z0")) {
ctx.emit_warning_locless(
"initial stack symbol not defined, defaulting to 'Z0'",
);
} else {
ctx.emit_error_locless("initial stack symbol not defined");
}
Symbol("Z0")
}
};
let initial_state = match initial_state {
Some(some) => some,
None => {
if states.contains_key(&State("q0")) {
ctx.emit_warning_locless("initial state not defined, defaulting to 'q0'");
} else {
ctx.emit_error_locless("initial state not defined");
}
State("q0")
}
};
if ctx.contains_errors() {
return None;
}
Some(Pda {
initial_state,
initial_stack,
states,
symbols,
alphabet,
final_states,
transitions,
})
}
}
impl<'a, 'b> Spanned<&'b ast::Tuple<'a>> {
@ -373,10 +586,12 @@ impl<'a, 'b> Spanned<&'b ast::Tuple<'a>> {
Spanned(symbol, *symbol_span),
));
}
_ => _ = ctx.emit_error(
_ => {
_ = ctx.emit_error(
"expected PDA transition function (state, letter|epsilon, symbol)",
self.1,
),
)
}
}
None
}

555
automata/src/automatan/tm.rs
View file

@ -2,291 +2,408 @@ use std::collections::HashSet;
use super::*;
use crate::{delta_lower, gamma_upper, loader::{
BLANK_SYMBOL, Context, Spanned, ast::{self, Symbol as Sym}, log::LogSink
}};
#[derive(Debug, PartialEq, Eq, Clone, Copy, Hash)]
#[cfg_attr(feature = "serde", derive(serde::Serialize))]
pub struct TransitionFrom<'a> {
use crate::{
delta_lower, dual_struct_serde,
loader::{
BLANK_SYMBOL, Context, INITIAL_STATE, Spanned,
ast::{self, Symbol as Sym},
log::LogSink,
},
};
dual_struct_serde! {
#[derive(Debug, PartialEq, Eq, Clone, Copy, Hash)]
pub struct TransitionFrom<'a> {
#[serde(borrow)]
pub state: State<'a>,
#[serde(borrow)]
pub symbol: Symbol<'a>,
}
}
#[derive(Debug, PartialEq, Eq, Clone, Hash)]
#[cfg_attr(feature = "serde", derive(serde::Serialize))]
#[derive(Debug, PartialEq, Eq, Clone, Copy, Hash)]
#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
pub enum Direction {
Left,
Right,
None,
}
#[derive(Debug, PartialEq, Eq, Clone, Hash)]
#[cfg_attr(feature = "serde", derive(serde::Serialize))]
pub struct TransitionTo<'a> {
dual_struct_serde! {
#[derive(Debug, PartialEq, Eq, Clone, Copy, Hash)]
pub struct TransitionTo<'a> {
#[serde(borrow)]
pub state: State<'a>,
#[serde(borrow)]
pub symbol: Symbol<'a>,
pub direction: Direction,
pub transition: Span,
pub function: Span,
}
}
#[derive(Clone, Debug)]
#[allow(unused)]
#[cfg_attr(feature = "serde", serde_with::serde_as)]
#[cfg_attr(feature = "serde", derive(serde::Serialize))]
pub struct Tm<'a> {
dual_struct_serde! {{#[serde_with::serde_as]}
#[derive(Clone, Debug)]
pub struct Tm<'a> {
#[serde(borrow)]
pub initial_state: State<'a>,
pub initial_tape: Symbol<'a>,
#[serde(borrow)]
pub blank_symbol: Symbol<'a>,
#[serde(borrow)]
pub states: HashMap<State<'a>, StateInfo>,
#[serde(borrow)]
pub symbols: HashMap<Symbol<'a>, SymbolInfo>,
#[serde(borrow)]
pub final_states: HashMap<State<'a>, StateInfo>,
#[cfg(feature = "serde")]
#[serde(borrow)]
#[serde_as(as = "serde_with::Seq<(_, _)>")]
pub transitions: HashMap<TransitionFrom<'a>, HashSet<TransitionTo<'a>>>,
#[cfg(not(feature = "serde"))]
pub transitions: HashMap<TransitionFrom<'a>, HashSet<TransitionTo<'a>>>,
}
}
impl<'a> Tm<'a> {
pub fn parse(
pub fn compile(
items: impl Iterator<Item = Spanned<ast::TopLevel<'a>>>,
ctx: &mut Context<'a>,
options: Options,
) -> Option<Tm<'a>> {
let mut initial_state = None;
let mut initial_tape = None;
TmCompiler::new(ctx, options).compile(items)
}
}
let mut states = HashMap::new();
let mut symbols = HashMap::new();
let mut final_states = HashMap::new();
pub struct TmCompiler<'a, 'b> {
ctx: &'b mut Context<'a>,
options: Options,
let mut transitions: HashMap<TransitionFrom<'a>, HashSet<TransitionTo<'a>>> =
HashMap::new();
initial_state: Option<(State<'a>, Span)>,
blank_symbol: Option<(Symbol<'a>, Span)>,
states: HashMap<State<'a>, StateInfo>,
states_def: Option<Span>,
symbols: HashMap<Symbol<'a>, SymbolInfo>,
symbols_def: Option<Span>,
final_states: HashMap<State<'a>, StateInfo>,
final_states_def: Option<Span>,
transitions: HashMap<TransitionFrom<'a>, HashSet<TransitionTo<'a>>>,
}
impl<'a, 'b> TmCompiler<'a, 'b> {
pub fn new(ctx: &'b mut Context<'a>, options: Options) -> Self {
Self {
ctx,
options,
initial_state: Default::default(),
blank_symbol: Default::default(),
states: Default::default(),
states_def: Default::default(),
symbols: Default::default(),
symbols_def: Default::default(),
final_states: Default::default(),
final_states_def: Default::default(),
transitions: Default::default(),
}
}
pub fn compile(
mut self,
items: impl Iterator<Item = Spanned<ast::TopLevel<'a>>>,
) -> Option<Tm<'a>> {
for Spanned(element, span) in items {
self.compile_top_level(element, span);
}
if self.final_states_def.is_none() {
self.ctx
.emit_error_locless("final states never defined")
.emit_help_logless("add: F = {...}");
}
let initial_state = match self.initial_state {
Some(some) => some.0,
None => {
if self.states.contains_key(&State("q0")) {
self.ctx
.emit_warning_locless("initial state not defined, defaulting to 'q0'")
.emit_help_logless(format!("add: {INITIAL_STATE} = q0"));
} else {
self.ctx
.emit_error_locless("initial state not defined")
.emit_help_logless(format!("add: {BLANK_SYMBOL} = ..."));
}
State("q0")
}
};
let blank_symbol = match self.blank_symbol {
Some(some) => some.0,
None => {
if self.symbols.contains_key(&Symbol("B")) {
self.ctx
.emit_warning_locless("blank symbol not defined, defaulting to 'B'")
.emit_help_logless(format!("add: {BLANK_SYMBOL} = B"));
} else {
self.ctx
.emit_error_locless("blank symbol not defined")
.emit_help_logless(format!("add: {BLANK_SYMBOL} = ..."));
}
Symbol("B")
}
};
if self.transitions.is_empty() {
self.ctx
.emit_warning_locless("no transitions defined")
.emit_help_logless(
"consider defining one: d(state, symbol) = (state, symbol, direction) | {(state, symbol, direction), ...}",
)
.emit_info_logless(concat!("d can be ", delta_lower!(str)));
}
if self.ctx.contains_errors() {
return None;
}
Some(Tm {
initial_state,
blank_symbol,
states: self.states,
symbols: self.symbols,
final_states: self.final_states,
transitions: self.transitions,
})
}
fn compile_top_level(&mut self, element: ast::TopLevel<'a>, span: Span) {
use Spanned as S;
use ast::TopLevel as TL;
match element {
TL::Item(S("Q", _), list) => {
if !states.is_empty() {
ctx.emit_error("states already set", span);
}
let Some(list) = list.expect_set(ctx) else {
continue;
};
for item in list {
let Some(ident) = item.expect_ident(ctx) else {
continue;
};
if states
.insert(State(ident), StateInfo { definition: item.1 })
.is_some()
{
ctx.emit_error("state redefined", item.1);
}
}
if list.is_empty() {
ctx.emit_error("states cannot be empty", span);
}
}
TL::Item(S("F", _), list) => {
if !final_states.is_empty() {
ctx.emit_error("final states already set", span);
}
let Some(list) = list.expect_set(ctx) else {
continue;
};
for item in list {
let Some(ident) = item.expect_ident(ctx) else {
continue;
};
if states.contains_key(&State(ident)) {
if final_states
.insert(State(ident), StateInfo { definition: item.1 })
.is_none()
{
ctx.emit_error("final state redefined", item.1);
}
} else {
ctx.emit_error("final state not defined in set of states", item.1);
}
}
}
TL::Item(S(gamma_upper!(pat), _), list) => {
if !symbols.is_empty() {
ctx.emit_error("tape symbols already set", span);
}
let Some(list) = list.expect_set(ctx) else {
continue;
};
for item in list {
let Some(ident) = item.expect_ident(ctx) else {
continue;
};
if symbols
.insert(Symbol(ident), SymbolInfo { definition: item.1 })
.is_some()
{
ctx.emit_error("tape symbol redefined", item.1);
}
}
if list.is_empty() {
ctx.emit_error("tape symbols cannot be empty", span);
}
}
TL::Item(S("q0", _), S(src, src_d)) => match src {
ast::Item::Symbol(Sym::Ident(ident)) => {
if initial_state.is_some() {
ctx.emit_error("initial state already set", span);
}
if states.contains_key(&State(ident)) {
initial_state = Some(State(ident))
} else {
ctx.emit_error("initial state symbol not defined as a state", src_d);
}
}
_ => _ = ctx.emit_error("expected ident", src_d),
},
TL::Item(S(BLANK_SYMBOL, _), S(src, src_d)) => match src {
ast::Item::Symbol(Sym::Ident(ident)) => {
if initial_tape.is_some() {
ctx.emit_error("initial tape symbol already set", span);
}
if symbols.contains_key(&Symbol(ident)) {
initial_tape = Some(Symbol(ident));
} else {
ctx.emit_error(
"initial tape symbol not defined as a tape symbol",
src_d,
);
}
}
_ => _ = ctx.emit_error("expected ident", src_d),
},
TL::Item(S("Q", _), list) => self.compile_states(list, span),
TL::Item(S(delta_lower!(pat), _), list) => self.compile_symbols(list, span),
TL::Item(S("F", _), list) => self.compile_final_states(list, span),
TL::Item(S(INITIAL_STATE, _), item) => self.compile_initial_state(item, span),
TL::Item(S(BLANK_SYMBOL, _), item) => self.compile_blank_symbol(item, span),
TL::Item(S(name, dest_s), _) => {
ctx.emit_error(format!("unknown item {name:?}, expected states, symbols, final states, initial state, blank symbol"), dest_s);
self.ctx.emit_error(format!("unknown item {name:?}, expected states | symbols | final states | initial state | blank symbol"), dest_s);
}
TL::TransitionFunc(S((S(delta_lower!(pat), _), tuple), _), list) => {
let list = list.set_weak();
let Some((from_state, from_tape)) =
tuple.as_ref().expect_tm_transition_function(ctx)
else {
continue;
};
if !states.contains_key(&State(from_state.0)) {
ctx.emit_error("transition state not defined as state", from_state.1);
continue;
};
if !symbols.contains_key(&Symbol(from_tape.0)) {
ctx.emit_error(
"transition tape symbol not defined as tape symbol",
from_tape.1,
);
continue;
};
for item in list {
let Some((to_state, to_tape, direction)) = item
.expect_tuple(ctx)
.and_then(|item| item.expect_tm_transition(ctx))
else {
continue;
};
if !states.contains_key(&State(to_state.0)) {
ctx.emit_error("transition state not defined as state", to_state.1);
continue;
};
let entry: &mut _ = transitions
.entry(TransitionFrom {
state: State(from_state.0),
symbol: Symbol(from_tape.0),
})
.or_default();
if !entry.is_empty() && !options.non_deterministic {
ctx.emit_error("transition already defined for this starting point (non determinism not permitted)", item.1);
}
if !entry.insert(TransitionTo {
state: State(to_state.0),
symbol: Symbol(to_tape.0),
direction: direction.0,
function: tuple.1,
transition: item.1,
}) {
ctx.emit_warning("duplicate transition", item.1);
}
}
TL::TransitionFunc(S((S(delta_lower!(pat), _), args), _), list) => {
self.compile_transition_function(args, list)
}
TL::TransitionFunc(S((S(name, _), _), dest_s), _) => {
ctx.emit_error(
self.ctx.emit_error(
format!(
"unknown function {name:?}, expected transition function ( {} )", delta_lower!(str)
"unknown function {name:?}, expected transition function ( {} )",
delta_lower!(str)
),
dest_s,
);
}
TL::ProductionRule(_, _) => {
ctx.emit_error("unexpected production rule", span);
self.ctx.emit_error("unexpected production rule", span);
}
TL::Table() => _ = ctx.emit_error("unexpected table", span),
TL::Table() => _ = self.ctx.emit_error("unexpected table", span),
}
}
if symbols.is_empty() {
ctx.emit_error_locless("tape symbols never defined");
fn compile_states(&mut self, list: Spanned<ast::Item<'a>>, top_level: Span) {
if let Some(previous) = self.states_def {
self.ctx
.emit_error("states already set", top_level)
.emit_info("previously defined here", previous);
}
let Some(list) = list.expect_set(self.ctx) else {
return;
};
for item in list {
let Some(ident) = item.expect_ident(self.ctx) else {
continue;
};
if let Some(previous) = self
.states
.insert(State(ident), StateInfo { definition: item.1 })
{
self.ctx
.emit_error("state redefined", item.1)
.emit_info("previously defined here", previous.definition);
}
}
if states.is_empty() {
ctx.emit_error_locless("states never defined");
if list.is_empty() {
self.ctx.emit_error("states cannot be empty", top_level);
}
self.states_def = Some(top_level);
}
let initial_tape = match initial_tape {
Some(some) => some,
None => {
if symbols.contains_key(&Symbol("z0")) {
ctx.emit_warning_locless("initial tape symbol not defined, defaulting to 'z0'");
fn compile_symbols(&mut self, list: Spanned<ast::Item<'a>>, top_level: Span) {
if let Some(previous) = self.symbols_def {
self.ctx
.emit_error("stack symbols already set", top_level)
.emit_info("previously defined here", previous);
}
let Some(list) = list.expect_set(self.ctx) else {
return;
};
for item in list {
let Some(ident) = item.expect_ident(self.ctx) else {
continue;
};
if let Some(previous) = self
.symbols
.insert(Symbol(ident), SymbolInfo { definition: item.1 })
{
self.ctx
.emit_error("stack symbol redefined", item.1)
.emit_info("previously defined here", previous.definition);
}
}
if list.is_empty() {
self.ctx.emit_error("states cannot be empty", top_level);
}
self.symbols_def = Some(top_level);
}
fn compile_final_states(&mut self, list: Spanned<ast::Item<'a>>, top_level: Span) {
if let Some(previous) = self.final_states_def {
self.ctx
.emit_error("final states already set", top_level)
.emit_help("previously defined here", previous);
}
let Some(list) = list.expect_set(self.ctx) else {
return;
};
for item in list {
let Some(ident) = item.expect_ident(self.ctx) else {
continue;
};
if self.states.contains_key(&State(ident)) {
if self
.final_states
.insert(State(ident), StateInfo { definition: item.1 })
.is_some()
{
self.ctx.emit_error("final state redefined", item.1);
}
} else {
ctx.emit_error_locless("initial tape symbol not defined");
self.ctx
.emit_error("final state not defined in set of states", item.1);
}
Symbol("z0")
}
self.final_states_def = Some(top_level);
}
fn compile_initial_state(
&mut self,
Spanned(src, src_d): Spanned<ast::Item<'a>>,
top_level: Span,
) {
match src {
ast::Item::Symbol(Sym::Ident(ident)) => {
if let Some((_, previous)) = self.initial_state {
self.ctx
.emit_error("initial state already set", top_level)
.emit_help("previously defined here", previous);
}
if self.states.contains_key(&State(ident)) {
self.initial_state = Some((State(ident), top_level))
} else {
self.ctx
.emit_error("initial state symbol not defined as a state", src_d);
}
}
_ => _ = self.ctx.emit_error("expected ident", src_d),
}
}
fn compile_blank_symbol(
&mut self,
Spanned(src, src_d): Spanned<ast::Item<'a>>,
top_level: Span,
) {
match src {
ast::Item::Symbol(Sym::Ident(ident)) => {
if let Some((_, previous)) = self.blank_symbol {
self.ctx
.emit_error("blank symbol already set", top_level)
.emit_help("previously defined here", previous);
}
if self.states.contains_key(&State(ident)) {
self.blank_symbol = Some((Symbol(ident), top_level))
} else {
self.ctx
.emit_error("blank symbol not defined as a state", src_d);
}
}
_ => _ = self.ctx.emit_error("expected ident", src_d),
}
}
fn compile_transition_function(
&mut self,
args: Spanned<ast::Tuple<'a>>,
list: Spanned<ast::Item<'a>>,
) {
let list = list.set_weak();
let Some((from_state, from_tape)) = args.as_ref().expect_tm_transition_function(self.ctx)
else {
return;
};
if !self.states.contains_key(&State(from_state.0)) {
self.ctx
.emit_error("transition state not defined as state", from_state.1);
return;
};
if !self.symbols.contains_key(&Symbol(from_tape.0)) {
self.ctx.emit_error(
"transition tape symbol not defined as tape symbol",
from_tape.1,
);
return;
};
let initial_state = match initial_state {
Some(some) => some,
None => {
if states.contains_key(&State("q0")) {
ctx.emit_warning_locless("initial state not defined, defaulting to 'q0'");
} else {
ctx.emit_error_locless("initial state not defined");
}
State("q0")
}
for item in list {
let Some((to_state, to_tape, direction)) = item
.expect_tuple(self.ctx)
.and_then(|item| item.expect_tm_transition(self.ctx))
else {
continue;
};
if ctx.contains_errors() {
return None;
}
if !self.states.contains_key(&State(to_state.0)) {
self.ctx
.emit_error("transition state not defined as state", to_state.1);
continue;
};
Some(Tm {
initial_state,
initial_tape,
states,
symbols,
final_states,
transitions,
let entry: &mut _ = self
.transitions
.entry(TransitionFrom {
state: State(from_state.0),
symbol: Symbol(from_tape.0),
})
.or_default();
if !entry.is_empty() && !self.options.non_deterministic {
self.ctx.emit_error("transition already defined for this starting point (non determinism not permitted)", item.1);
}
if !entry.insert(TransitionTo {
state: State(to_state.0),
symbol: Symbol(to_tape.0),
direction: direction.0,
function: args.1,
transition: item.1,
}) {
self.ctx.emit_warning("duplicate transition", item.1);
}
}
}
}
@ -335,10 +452,12 @@ impl<'a> Spanned<&ast::Tuple<'a>> {
Spanned(direction, *direction_span),
));
}
_ => _ = ctx.emit_error(
_ => {
_ = ctx.emit_error(
"expected TM transition function (state, symbol, direction)",
self.1,
),
)
}
}
None
}

80
automata/src/lib.rs
View file

@ -1,7 +1,6 @@
pub mod automatan;
pub mod loader;
#[macro_export]
macro_rules! dual_struct_serde {
($({$(#[$serde_specific:meta])*})?
@ -34,3 +33,82 @@ macro_rules! dual_struct_serde {
}
};
}
#[macro_export]
macro_rules! dual_enum_serde {
(
$( {$(#[$serde_specific:meta])*} )?
$(#[$enum_meta:meta])*
$vis:vis enum $Name:ident $(<$($gen:tt),*>)?
{
$(
$(#[$variant_meta:meta])*
$Variant:ident
$(
// Tuple variant: Variant(T1, T2, ...)
( $(
$(#[$tfield_meta:meta])*
$tfield_ty:ty
),* $(,)? )
)?
$(
// Struct variant: Variant { a: T, b: U, ... }
{ $(
$(#[$sfield_meta:meta])*
$sfield_vis:vis $sfield_name:ident : $sfield_ty:ty
),* $(,)? }
)?
),* $(,)?
}
) => {
#[cfg(feature = "serde")]
$(#[$enum_meta])*
#[derive(serde::Serialize, serde::Deserialize)]
$( $(#[$serde_specific])* )?
$vis enum $Name $(<$($gen),*>)? {
$(
$(#[$variant_meta])*
$Variant
$(
(
$(
$(#[$tfield_meta])*
$tfield_ty
),*
)
)?
$(
{
$(
$(#[$sfield_meta])*
$sfield_vis $sfield_name: $sfield_ty
),*
}
)?
),*
}
#[cfg(not(feature = "serde"))]
$(#[$enum_meta])*
$vis enum $Name $(<$($gen),*>)? {
$(
// strip variant + field attrs in non-serde version
$Variant
$(
(
$(
$tfield_ty
),*
)
)?
$(
{
$(
$sfield_vis $sfield_name: $sfield_ty
),*
}
)?
),*
}
};
}

28
automata/src/loader/ast.rs
View file

@ -77,7 +77,9 @@ impl<'a> Spanned<Item<'a>> {
pub fn expect_ident(&self, ctx: &mut Context<'a>) -> Option<&'a str> {
match &self.0 {
Item::Symbol(Symbol::Ident(ident)) => return Some(ident),
Item::Symbol(Symbol::Epsilon(_)) => _ = ctx.emit_error("expected ident found epsilon", self.1),
Item::Symbol(Symbol::Epsilon(_)) => {
_ = ctx.emit_error("expected ident found epsilon", self.1)
}
Item::Tuple(_) => _ = ctx.emit_error("expected ident found tuple", self.1),
Item::List(_) => _ = ctx.emit_error("expected ident found list", self.1),
}
@ -86,8 +88,12 @@ impl<'a> Spanned<Item<'a>> {
pub fn expect_set(&self, ctx: &mut Context<'a>) -> Option<&[Spanned<Item<'a>>]> {
match &self.0 {
Item::Symbol(Symbol::Ident(_)) => _ = ctx.emit_error("expected set found ident", self.1),
Item::Symbol(Symbol::Epsilon(_)) => _ = ctx.emit_error("expected set found epsilon", self.1),
Item::Symbol(Symbol::Ident(_)) => {
_ = ctx.emit_error("expected set found ident", self.1)
}
Item::Symbol(Symbol::Epsilon(_)) => {
_ = ctx.emit_error("expected set found epsilon", self.1)
}
Item::Tuple(_) => _ = ctx.emit_error("expected set found tuple", self.1),
Item::List(list) => return Some(&list.0),
}
@ -96,8 +102,12 @@ impl<'a> Spanned<Item<'a>> {
pub fn expect_list(&self, ctx: &mut Context<'a>) -> Option<&[Spanned<Item<'a>>]> {
match &self.0 {
Item::Symbol(Symbol::Ident(_)) => _ = ctx.emit_error("expected list found ident", self.1),
Item::Symbol(Symbol::Epsilon(_)) => _ = ctx.emit_error("expected list found epsilon", self.1),
Item::Symbol(Symbol::Ident(_)) => {
_ = ctx.emit_error("expected list found ident", self.1)
}
Item::Symbol(Symbol::Epsilon(_)) => {
_ = ctx.emit_error("expected list found epsilon", self.1)
}
Item::Tuple(_) => _ = ctx.emit_error("expected list found tuple", self.1),
Item::List(list) => return Some(&list.0),
}
@ -120,8 +130,12 @@ impl<'a> Spanned<Item<'a>> {
pub fn expect_tuple(&self, ctx: &mut Context<'a>) -> Option<Spanned<&Tuple<'a>>> {
match &self.0 {
Item::Symbol(Symbol::Ident(_)) => _ = ctx.emit_error("expected tuple found ident", self.1),
Item::Symbol(Symbol::Epsilon(_)) => _ = ctx.emit_error("expected tuple found epsilon", self.1),
Item::Symbol(Symbol::Ident(_)) => {
_ = ctx.emit_error("expected tuple found ident", self.1)
}
Item::Symbol(Symbol::Epsilon(_)) => {
_ = ctx.emit_error("expected tuple found epsilon", self.1)
}
Item::Tuple(tuple) => return Some(Spanned(tuple, self.1)),
Item::List(_) => _ = ctx.emit_error("expected tuple found list", self.1),
}

5
automata/src/loader/lexer.rs
View file

@ -96,7 +96,10 @@ fn begin_ident(c: char) -> bool {
}
fn continue_ident(c: char) -> bool {
c.is_alphanumeric() || c == '_' || c=='\'' || (!c.is_ascii() && !c.is_control() && !c.is_whitespace())
c.is_alphanumeric()
|| c == '_'
|| c == '\''
|| (!c.is_ascii() && !c.is_control() && !c.is_whitespace())
}
impl<'a> std::iter::Iterator for Lexer<'a> {

1
automata/src/loader/log.rs
View file

@ -2,7 +2,6 @@ use std::fmt::Display;
use crate::loader::Span;
#[cfg_attr(feature = "serde", derive(serde::Serialize))]
pub struct Logs {
logs: Vec<LogEntry>,

24
automata/src/loader/mod.rs
View file

@ -1,5 +1,6 @@
use crate::{
automatan::*,
dual_enum_serde,
loader::{
ast::TopLevel,
log::{LogEntry, LogSink},
@ -120,13 +121,14 @@ impl<'a> Context<'a> {
}
}
#[cfg_attr(feature = "serde", derive(serde::Serialize))]
#[cfg_attr(feature = "serde", serde(tag = "type"))]
#[cfg_attr(feature = "serde", serde(rename_all = "snake_case"))]
pub enum Machine<'a> {
Fa(fa::Fa<'a>),
Pda(pda::Pda<'a>),
Tm(tm::Tm<'a>),
dual_enum_serde! {
{#[serde(tag = "type")] #[serde(rename_all = "snake_case")]}
#[derive(Clone, Debug)]
pub enum Machine<'a> {
Fa(#[serde(borrow)] fa::Fa<'a>),
Pda(#[serde(borrow)] pda::Pda<'a>),
Tm(#[serde(borrow)] tm::Tm<'a>),
}
}
pub fn parse_universal<'a>(ctx: &mut Context<'a>) -> Option<Machine<'a>> {
@ -194,9 +196,9 @@ pub fn parse_universal<'a>(ctx: &mut Context<'a>) -> Option<Machine<'a>> {
Some(match parse_type(items.next(), ctx)? {
Type::Dfa => Machine::Fa(fa::Fa::compile(items, ctx, D)?),
Type::Nfa => Machine::Fa(fa::Fa::compile(items, ctx, N)?),
Type::Dpda => Machine::Pda(pda::Pda::parse(items, ctx, D)?),
Type::Npda => Machine::Pda(pda::Pda::parse(items, ctx, N)?),
Type::Tm => Machine::Tm(tm::Tm::parse(items, ctx, D)?),
Type::Ntm => Machine::Tm(tm::Tm::parse(items, ctx, N)?),
Type::Dpda => Machine::Pda(pda::Pda::compile(items, ctx, D)?),
Type::Npda => Machine::Pda(pda::Pda::compile(items, ctx, N)?),
Type::Tm => Machine::Tm(tm::Tm::compile(items, ctx, D)?),
Type::Ntm => Machine::Tm(tm::Tm::compile(items, ctx, N)?),
})
}

2
automata/src/loader/parser.rs
View file

@ -93,7 +93,7 @@ impl<'a, 'b> Parser<'a, 'b> {
fn parse_as_symbol(&mut self, tok: S<T<'a>>) -> S<Symbol<'a>> {
match tok {
S(T::Tilde, r) => S(Symbol::Epsilon("~"), r),
S(T::Ident(repr@ epsilon!(pat)), r) => S(Symbol::Epsilon(repr), r),
S(T::Ident(repr @ epsilon!(pat)), r) => S(Symbol::Epsilon(repr), r),
S(T::Ident(ident), r) => S(Symbol::Ident(ident), r),
S(got, span) => {
self.ctx.emit_error(

6
cli/src/main.rs
View file

@ -1,5 +1 @@
pub fn main(){
}
pub fn main() {}

2
web/root/src/automata.ts
View file

@ -189,7 +189,7 @@ export type Tm = {
type: "tm";
initial_state: State;
initial_tape: Symbol;
blank_symbol: Symbol;
states: Map<State, StateInfo>;
symbols: Map<Symbol, SymbolInfo>;
alphabet: Map<Letter, LetterInfo>;

5
web/root/src/examples.ts
View file

@ -81,11 +81,12 @@ d(q4, 3) = q2`,
new Example(
"DPDA",
"unequal",
`type=DPDA
`type = DPDA
Q = {q0, qas, qeq, qmb, qlb} // states
E = {a, b} // alphabet
T = {z0, A} // stack
F = {qmb, qlb} // final states
accept = F // accept by final state
q0 = q0
z0 = z0
@ -112,6 +113,7 @@ d(qmb, b, z0) = (qmb, z0)`,
Q = {q0, q1} // states
E = {a, b} // alphabet
T = {z0, A, B} // stack
accept = E // accept by empty stack
q0 = q0
z0 = z0
@ -142,6 +144,7 @@ d(q1, b, B) = { (q1, epsilon) }`,
Q = {q0, q1} // states
E = {a, b} // alphabet
T = {z0, A, B} // stack
accept = E // accept by empty stack
q0 = q0
z0 = z0

2
web_lib/src/lib.rs
View file

@ -94,7 +94,7 @@ pub fn lex(input: &str) -> Vec<Tok> {
}
// ugly hack to keep single ascii letters non keyworded for user
Token::Ident(ident) if ident.is_ascii() && ident.len()==1 => Kind::Ident,
Token::Ident(ident) if ident.is_ascii() && ident.len() == 1 => Kind::Ident,
Token::Ident(
epsilon!(pat) | delta_lower!(pat) | sigma_upper!(pat) | gamma_upper!(pat),
) => Kind::Keyword,