diff options
author | sjg <sjg@FreeBSD.org> | 2015-05-27 01:19:58 +0000 |
---|---|---|
committer | sjg <sjg@FreeBSD.org> | 2015-05-27 01:19:58 +0000 |
commit | 65145fa4c81da358fcbc3b650156dab705dfa34e (patch) | |
tree | 55c065b6730aaac2afb6c29933ee6ec5fa4c4249 /usr.bin/lex | |
parent | 60ff4eb0dff94a04d75d0d52a3957aaaf5f8c693 (diff) | |
parent | e6b664c390af88d4a87208bc042ce503da664c3b (diff) | |
download | FreeBSD-src-65145fa4c81da358fcbc3b650156dab705dfa34e.zip FreeBSD-src-65145fa4c81da358fcbc3b650156dab705dfa34e.tar.gz |
Merge sync of head
Diffstat (limited to 'usr.bin/lex')
-rw-r--r-- | usr.bin/lex/Makefile | 2 | ||||
-rw-r--r-- | usr.bin/lex/lex.1 | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/usr.bin/lex/Makefile b/usr.bin/lex/Makefile index f896092..faa503a 100644 --- a/usr.bin/lex/Makefile +++ b/usr.bin/lex/Makefile @@ -51,7 +51,7 @@ bootstrap: ${GENFILES:S/^/init/g} @diff -I '^#line ' -I '\$$FreeBS[D]: .*\$$' -q \ ${.CURDIR}/init${_f} ${_f} 2> /dev/null || { \ echo "Bootstrapping ${_f}" ; \ - cp -f ${.CURDIR}/init${_f} ${_f} ; \ + ${CP} ${.CURDIR}/init${_f} ${_f} ; \ } .endfor diff --git a/usr.bin/lex/lex.1 b/usr.bin/lex/lex.1 index fdb1881..83d3a0c 100644 --- a/usr.bin/lex/lex.1 +++ b/usr.bin/lex/lex.1 @@ -2001,7 +2001,7 @@ can be used to control whether the current buffer's scanning context for the next token match is done as though at the beginning of a line. A non-zero macro argument makes rules anchored with -'^' active, while a zero argument makes '^' rules inactive. + '^' active, while a zero argument makes '^' rules inactive. .PP The macro .B YY_AT_BOL() @@ -2356,8 +2356,7 @@ automatically anyway. .TP .B \-F, \-\-fast specifies that the -.ul -fast +.I fast scanner table representation should be used (and stdio bypassed). This representation is about as fast as the full table representation |