Mercurial > octave
diff libinterp/parse-tree/lex.h @ 22869:f75d289645ec
make deleted functions public
* octave-gui.h, resource-manager.h, shortcut-manager.h,
base-text-renderer.h, c-file-ptr-stream.h, dynamic-ld.cc,
dynamic-ld.h, event-queue.h, ft-text-renderer.cc, gl-render.cc,
gl-render.h, graphics.cc, graphics.in.h, interpreter.h, mex.cc,
mxarray.in.h, oct-fstrm.h, oct-iostrm.h, oct-prcstrm.h,
oct-procbuf.h, oct-stdstrm.h, oct-stream.cc, oct-stream.h,
oct-strstrm.h, octave-link.h, pager.h, profiler.h, sighandlers.cc,
symtab.h, text-renderer.h, zfstream.h, __init_fltk__.cc,
ov-builtin.h, ov-dld-fcn.h, ov-fcn.h, ov-mex-fcn.h, ov-typeinfo.h,
ov-usr-fcn.h, octave.h, lex.h, parse.h, pt-arg-list.h,
pt-array-list.h, pt-assign.h, pt-binop.h, pt-bp.h, pt-cell.h,
pt-check.h, pt-classdef.h, pt-cmd.h, pt-colon.h, pt-const.h,
pt-decl.h, pt-eval.h, pt-except.h, pt-exp.h, pt-fcn-handle.h,
pt-funcall.h, pt-id.h, pt-idx.h, pt-jump.h, pt-loop.h, pt-mat.h,
pt-misc.h, pt-pr-code.h, pt-select.h, pt-stmt.h, pt-unop.h,
pt-walk.h, pt.h, token.h, Array.cc, idx-vector.h, oct-fftw.h,
sparse-chol.cc, sparse-qr.cc, file-ops.h, mach-info.h, oct-env.h,
action-container.h, cmd-edit.cc, cmd-edit.h, cmd-hist.h,
oct-locbuf.h, oct-mutex.h, oct-shlib.cc, oct-sort.h, pathsearch.h,
singleton-cleanup.h, unwind-prot.h, url-transfer.cc, url-transfer.h:
Declare deleted copy constructors and assignment operators public.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Tue, 06 Dec 2016 12:40:45 -0500 |
| parents | 87e3163f6c87 |
| children | aedc662896a3 |
line wrap: on
line diff
--- a/libinterp/parse-tree/lex.h Tue Dec 06 10:59:29 2016 -0500 +++ b/libinterp/parse-tree/lex.h Tue Dec 06 12:40:45 2016 -0500 @@ -195,6 +195,12 @@ token_cache (void) : buffer () { } + // No copying! + + token_cache (const token_cache&) = delete; + + token_cache& operator = (const token_cache&) = delete; + ~token_cache (void) { clear (); } void push (token *tok) @@ -257,12 +263,6 @@ private: std::deque<token *> buffer; - - // No copying! - - token_cache (const token_cache&) = delete; - - token_cache& operator = (const token_cache&) = delete; }; lexical_feedback (void) @@ -292,6 +292,12 @@ init (); } + // No copying! + + lexical_feedback (const lexical_feedback&) = delete; + + lexical_feedback& operator = (const lexical_feedback&) = delete; + ~lexical_feedback (void); void init (void); @@ -459,14 +465,6 @@ // Tokens generated by the lexer. token_cache tokens; - - private: - - // No copying! - - lexical_feedback (const lexical_feedback&) = delete; - - lexical_feedback& operator = (const lexical_feedback&) = delete; }; // base_lexer inherits from lexical_feedback because we will @@ -555,6 +553,12 @@ init (); } + // No copying! + + base_lexer (const base_lexer&) = delete; + + base_lexer& operator = (const base_lexer&) = delete; + virtual ~base_lexer (void); void init (void); @@ -709,12 +713,6 @@ protected: std::stack<int> start_state_stack; - - // No copying! - - base_lexer (const base_lexer&) = delete; - - base_lexer& operator = (const base_lexer&) = delete; }; class @@ -735,6 +733,12 @@ : base_lexer (interp_context), input_reader (eval_string, this) { } + // No copying! + + lexer (const lexer&) = delete; + + lexer& operator = (const lexer&) = delete; + void reset (void) { input_reader.reset (); @@ -773,14 +777,6 @@ int fill_flex_buffer (char *buf, unsigned int max_size); octave_input_reader input_reader; - - protected: - - // No copying! - - lexer (const lexer&) = delete; - - lexer& operator = (const lexer&) = delete; }; class @@ -814,6 +810,12 @@ append_input (input, eof); } + // No copying! + + push_lexer (const push_lexer&) = delete; + + push_lexer& operator = (const push_lexer&) = delete; + bool is_push_lexer (void) const { return true; } void reset (void) @@ -848,12 +850,6 @@ protected: int pflag; - - // No copying! - - push_lexer (const push_lexer&) = delete; - - push_lexer& operator = (const push_lexer&) = delete; }; }