Skip to content

Commit 6e84eb9

Browse files
sdutoitsdutoit
committed
internal change: Remove \exposr macro.
\exposr was the same as \expos anyways (it probably meant something in the past, but doesn't seem to anymore) so replace all occurrences with \expos. Also update changemarks.sh to drop expos and exposr.
1 parent 484f99d commit 6e84eb9

File tree

5 files changed

+28
-29
lines changed

5 files changed

+28
-29
lines changed

‎source/future.tex

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -297,15 +297,15 @@
297297
virtual streambuf* setbuf(char* s, streamsize n);
298298

299299
private:
300-
typedef T1 strstate; // \exposr
301-
static const strstate allocated; // \exposr
302-
static const strstate constant; // \exposr
303-
static const strstate dynamic; // \exposr
304-
static const strstate frozen; // \exposr
305-
strstate strmode; // \exposr
306-
streamsize alsize; // \exposr
307-
void* (*palloc)(size_t); // \exposr
308-
void (*pfree)(void*); // \exposr
300+
typedef T1 strstate; // \expos
301+
static const strstate allocated; // \expos
302+
static const strstate constant; // \expos
303+
static const strstate dynamic; // \expos
304+
static const strstate frozen; // \expos
305+
strstate strmode; // \expos
306+
streamsize alsize; // \expos
307+
void* (*palloc)(size_t); // \expos
308+
void (*pfree)(void*); // \expos
309309
};
310310
}
311311
\end{codeblock}
@@ -911,7 +911,7 @@
911911
strstreambuf* rdbuf() const;
912912
char* str();
913913
private:
914-
strstreambuf sb; // \exposr
914+
strstreambuf sb; // \expos
915915
};
916916
}
917917
\end{codeblock}
@@ -1009,7 +1009,7 @@
10091009
char* str();
10101010
int pcount() const;
10111011
private:
1012-
strstreambuf sb; // \exposr
1012+
strstreambuf sb; // \expos
10131013
};
10141014
}
10151015
\end{codeblock}
@@ -1160,7 +1160,7 @@
11601160
char* str();
11611161

11621162
private:
1163-
strstreambuf sb; // \exposr
1163+
strstreambuf sb; // \expos
11641164
};
11651165
}
11661166
\end{codeblock}

‎source/iostreams.tex

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -802,9 +802,9 @@
802802
ios_base();
803803

804804
private:
805-
static int index; // \exposr
806-
long* iarray; // \exposr
807-
void** parray; // \exposr
805+
static int index; // \expos
806+
long* iarray; // \expos
807+
void** parray; // \expos
808808
};
809809
}
810810
\end{codeblock}
@@ -1077,7 +1077,7 @@
10771077
Init();
10781078
~Init();
10791079
private:
1080-
static int init_cnt; // \exposr
1080+
static int init_cnt; // \expos
10811081
};
10821082
}
10831083
\end{codeblock}
@@ -1582,7 +1582,7 @@
15821582
stateT state() const;
15831583
void state(stateT);
15841584
private;
1585-
stateT st; // \exposr
1585+
stateT st; // \expos
15861586
};
15871587
}
15881588
\end{codeblock}
@@ -4391,7 +4391,7 @@
43914391
template <class charT,class traits = char_traits<charT> >
43924392
class basic_istream<charT,traits>::sentry {
43934393
typedef traits traits_type;
4394-
bool ok_; // \exposr
4394+
bool ok_; // \expos
43954395
public:
43964396
explicit sentry(basic_istream<charT,traits>& is, bool noskipws = false);
43974397
~sentry();
@@ -5977,7 +5977,7 @@
59775977
namespace std {
59785978
template <class charT,class traits = char_traits<charT> >
59795979
class basic_ostream<charT,traits>::sentry {
5980-
bool ok_; // \exposr
5980+
bool ok_; // \expos
59815981
public:
59825982
explicit sentry(basic_ostream<charT,traits>& os);
59835983
~sentry();
@@ -7329,7 +7329,7 @@
73297329
= ios_base::in | ios_base::out);
73307330

73317331
private:
7332-
ios_base::openmode mode; // \exposr
7332+
ios_base::openmode mode; // \expos
73337333
};
73347334

73357335
template <class charT, class traits, class Allocator>
@@ -7835,7 +7835,7 @@
78357835
basic_string<charT,traits,Allocator> str() const;
78367836
void str(const basic_string<charT,traits,Allocator>& s);
78377837
private:
7838-
basic_stringbuf<charT,traits,Allocator> sb; // \exposr
7838+
basic_stringbuf<charT,traits,Allocator> sb; // \expos
78397839
};
78407840

78417841
template <class charT, class traits, class Allocator>
@@ -8027,7 +8027,7 @@
80278027
basic_string<charT,traits,Allocator> str() const;
80288028
void str(const basic_string<charT,traits,Allocator>& s);
80298029
private:
8030-
basic_stringbuf<charT,traits,Allocator> sb; // \exposr
8030+
basic_stringbuf<charT,traits,Allocator> sb; // \expos
80318031
};
80328032

80338033
template <class charT, class traits, class Allocator>
@@ -8221,7 +8221,7 @@
82218221
void str(const basic_string<charT,traits,Allocator>& str);
82228222

82238223
private:
8224-
basic_stringbuf<charT, traits> sb; // \exposr
8224+
basic_stringbuf<charT, traits> sb; // \expos
82258225
};
82268226

82278227
template <class charT, class traits, class Allocator>
@@ -9251,7 +9251,7 @@
92519251
void open(const string& s, ios_base::openmode mode = ios_base::in);
92529252
void close();
92539253
private:
9254-
basic_filebuf<charT,traits> sb; // \exposr
9254+
basic_filebuf<charT,traits> sb; // \expos
92559255
};
92569256

92579257
template <class charT, class traits>
@@ -9491,7 +9491,7 @@
94919491
void open(const string& s, ios_base::openmode mode = ios_base::out);
94929492
void close();
94939493
private:
9494-
basic_filebuf<charT,traits> sb; // \exposr
9494+
basic_filebuf<charT,traits> sb; // \expos
94959495
};
94969496

94979497
template <class charT, class traits>
@@ -9732,7 +9732,7 @@
97329732
void close();
97339733

97349734
private:
9735-
basic_filebuf<charT,traits> sb; // \exposr
9735+
basic_filebuf<charT,traits> sb; // \expos
97369736
};
97379737

97389738
template <class charT, class traits>

‎source/iterators.tex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2877,7 +2877,7 @@
28772877
ostream_iterator<T,charT,traits>& operator++(int);
28782878
private:
28792879
basic_ostream<charT,traits>* out_stream; // \expos
2880-
const charT* delim; // \exposr
2880+
const charT* delim; // \expos
28812881
};
28822882
}
28832883
\end{codeblock}

‎source/macros.tex

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,6 @@
192192
%% Code annotations
193193
\newcommand{\EXPO}[1]{\textit{#1}}
194194
\newcommand{\expos}{\EXPO{exposition only}}
195-
\newcommand{\exposr}{\expos}
196195
\newcommand{\impdef}{\EXPO{implementation-defined}}
197196
\newcommand{\impdefx}[1]{\indeximpldef{#1}\EXPO{implementation-defined}}
198197
\newcommand{\notdef}{\EXPO{not defined}}

‎tools/changemarks.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ git archive $AFTER *.tex | tar xC after
2626

2727

2828
TEXTCMDS=tcode,term,grammarterm,techterm,defnx,defn,Fundescx,Fundesc,state,leftshift,EnterBlock,ExitBlock,NTS,EXPO,impdefx,UNSP,xname,mname,diffdef,stage,doccite,cvqual,numconst,logop
29-
SAFECMDS=Rplus,Cpp,CppIII,opt,shl,shr,dcr,exor,bigoh,tilde,bitand,bitor,xor,rightshift,enternote,enterexample,exitexample,required,requires,effects,postconditions,postcondition,preconditions,precondition,returns,throws,default,complexity,remark,remarks,note,notes,realnote,realnotes,errors,sync,implimits,replaceable,exceptionsafety,returntype,cvalue,ctype,ctypes,dtype,ctemplate,templalias,xref,xsee,ntbs,ntmbs,ntwcs,ntcxvis,ntcxxxiis,expos,exposr,exposrc,impdef,notdef,unspec,unspecbool,seebelow,unspecuniqtype,unspecalloctype,unun,change,rationale,effect,difficulty,howwide,uniquens,cv
29+
SAFECMDS=Rplus,Cpp,CppIII,opt,shl,shr,dcr,exor,bigoh,tilde,bitand,bitor,xor,rightshift,enternote,enterexample,exitexample,required,requires,effects,postconditions,postcondition,preconditions,precondition,returns,throws,default,complexity,remark,remarks,note,notes,realnote,realnotes,errors,sync,implimits,replaceable,exceptionsafety,returntype,cvalue,ctype,ctypes,dtype,ctemplate,templalias,xref,xsee,ntbs,ntmbs,ntwcs,ntcxvis,ntcxxxiis,expos,impdef,notdef,unspec,unspecbool,seebelow,unspecuniqtype,unspecalloctype,unun,change,rationale,effect,difficulty,howwide,uniquens,cv
3030
for i in *.tex ; do
3131
latexdiff --append-textcmd=$TEXTCMDS --append-safecmd=$SAFECMDS -c PICTUREENV='(?:picture|DIFnomarkup|codeblock)[\w\d*@]*' before/$i after/$i > $i
3232
done

0 commit comments

Comments
 (0)