Commit111cda0

committed

backout option propogation

1 parent8cfd76f commit111cda0Copy full SHA for 111cda0

File tree

-19

lines changed

-19

lines changed

Lines changed: 1 addition & 17 deletions

Original file line number	Diff line number	Diff line change
`@@ -106,13 +106,6 @@ impl Compiler {`
`106`	`106`	`}`
`107`	`107`	`}`
`108`	`108`
`109`		`-fnnew_with_options(max_group:usize,options:&RegexOptions) ->Compiler{`
`110`		`-Compiler{`
`111`		`-b:VMBuilder::new(max_group),`
`112`		`-options: options.clone(),`
`113`		`-}`
`114`		`-}`
`115`		`-`
`116`	`109`	`fnvisit(&mutself,info:&Info<'_>,hard:bool) ->Result<()>{`
`117`	`110`	`if !hard && !info.hard{`
`118`	`111`	`// easy case, delegate entire subexpr`
`@@ -532,16 +525,7 @@ pub(crate) fn compile_inner(inner_re: &str, options: &RegexOptions) -> Result<Ra`
`532`	`525`
`533`	`526`	`/// Compile the analyzed expressions into a program.`
`534`	`527`	`pubfncompile(info:&Info<'_>) ->Result<Prog>{`
`535`		`-compile_with_options(info,None)`
`536`		`-}`
`537`		`-`
`538`		`-/// Compile the analyzed expressions into a program.`
`539`		`-pubfncompile_with_options(info:&Info<'_>,options:Option<&RegexOptions>) ->Result<Prog>{`
`540`		`-letmut c =ifletSome(opts) = options{`
`541`		`-Compiler::new_with_options(info.end_group, opts)`
`542`		`-}else{`
`543`		`-Compiler::new(info.end_group)`
`544`		`-};`
	`528`	`+letmut c =Compiler::new(info.end_group);`
`545`	`529`	`c.visit(info,false)?;`
`546`	`530`	`c.b.add(Insn::End);`
`547`	`531`	`Ok(c.b.build())`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -209,7 +209,7 @@ mod replacer;`
`209`	`209`	`mod vm;`
`210`	`210`
`211`	`211`	`usecrate::analyze::analyze;`
`212`		`-usecrate::compile::compile_with_options;`
	`212`	`+usecrate::compile::compile;`
`213`	`213`	`usecrate::parse::{ExprTree,NamedGroups,Parser};`
`214`	`214`	`usecrate::regexflags::*;`
`215`	`215`	`usecrate::vm::{Prog,OPTION_SKIPPED_EMPTY_MATCH};`
`@@ -724,7 +724,7 @@ impl Regex {`
`724`	`724`	`});`
`725`	`725`	`}`
`726`	`726`
`727`		`-let prog =compile_with_options(&info,Some(&options))?;`
	`727`	`+let prog =compile(&info)?;`
`728`	`728`	`Ok(Regex{`
`729`	`729`	`inner:RegexImpl::Fancy{`
`730`	`730`	`prog,`

Comments

(0)