Merge branch 'master' of https://github.com/PJBoy/cppreference-doc.git

Author: p12tic

gadgets/standard_revisions.js

@@ -72,7 +72,7 @@ $(function() {
     // assumed that the values are integers starting at zero and thus they can
     // be used as an index in regular arrays.
     var Rev_c = { DIFF: 0, FIRST: 1, C89: 1, C99: 2, C11: 3, LAST: 4 };
-    var Rev_cxx = { DIFF: 0, FIRST: 1, CXX98: 1, CXX11: 2, CXX14: 3, CXX17: 4, LAST: 5 };
+    var Rev_cxx = { DIFF: 0, FIRST: 1, CXX98: 1, CXX11: 2, CXX14: 3, CXX17: 4, CXX20: 5, LAST: 6 };
 
     var Rev;
 
@@ -96,6 +96,7 @@ $(function() {
         { rev: Rev.CXX11, title: 'C++11' },
         { rev: Rev.CXX14, title: 'C++14' },
         { rev: Rev.CXX17, title: 'C++17' },
+        { rev: Rev.CXX20, title: 'C++20' },
     ];
 
     var desc;
@@ -140,6 +141,9 @@ $(function() {
         if (el.hasClass('t-since-cxx17')) {
             return { since: true, rev: Rev.CXX17 };
         }
+        if (el.hasClass('t-since-cxx20')) {
+            return { since: true, rev: Rev.CXX20 };
+        }
         if (el.hasClass('t-until-cxx11')) {
             return { since: false, rev: Rev.CXX11 };
         }
@@ -149,6 +153,9 @@ $(function() {
         if (el.hasClass('t-until-cxx17')) {
             return { since: false, rev: Rev.CXX17 };
         }
+        if (el.hasClass('t-until-cxx20')) {
+            return { since: false, rev: Rev.CXX20 };
+        }
         return { since: true, rev: Rev.CXX98 };
     }
 
@@ -217,6 +224,11 @@ $(function() {
         this.map[rev] = true;
     }
 
+    // Sets the visibility on the given revision to true.
+    VisibilityMap.prototype.remove = function(rev) {
+        this.map[rev] = false;
+    }
+
 
     /*  Fills the visibility map with the given value. After the operation
         map.is_visible_on(rev) == value for all valid revisions.
@@ -282,31 +294,31 @@ $(function() {
         visibility map corresponding to these css classes. Rev.DIFF is not
         included into the returned visibility map.
     */
-    // FIXME: this function handles only certain cases of fully closed ranges
     function get_visibility_map_cxx(el) {
-        // DIFF: 0, CXX98: 1, CXX11: 2, CXX14: 3, CXX17: 4
-        if (el.hasClass('t-since-cxx17')) {
-            return new VisibilityMap([Rev.CXX17]);
-        }
-        if (el.hasClass('t-since-cxx14')) {
-            return new VisibilityMap([Rev.CXX14, Rev.CXX17]);
-        }
-        if (el.hasClass('t-since-cxx11')) {
-            if (el.hasClass('t-until-cxx14')) {
-                return new VisibilityMap([Rev.CXX11]);
+        // DIFF: 0, CXX98: 1, CXX11: 2, CXX14: 3, CXX17: 4, CXX20: 5
+        var classes_cxx = [
+            { rev: Rev.CXX11, since: 't-since-cxx11', until: 't-until-cxx11' },
+            { rev: Rev.CXX14, since: 't-since-cxx14', until: 't-until-cxx14' },
+            { rev: Rev.CXX17, since: 't-since-cxx17', until: 't-until-cxx17' },
+            { rev: Rev.CXX20, since: 't-since-cxx20', until: 't-until-cxx20' },
+        ];
+        var map = new VisibilityMap();
+        for (var i = 0; i < classes_cxx.length; i++) {
+            if (el.hasClass(classes_cxx[i].since)) {
+                break;
             }
-            return new VisibilityMap([Rev.CXX11, Rev.CXX14, Rev.CXX17]);
-        }
-        if (el.hasClass('t-until-cxx11')) {
-            return new VisibilityMap([Rev.CXX98]);
         }
-        if (el.hasClass('t-until-cxx14')) {
-            return new VisibilityMap([Rev.CXX98, Rev.CXX11]);
+        if (i === classes_cxx.length) {
+            map.add(Rev.CXX98);
+            i = 0;
         }
-        if (el.hasClass('t-until-cxx17')) {
-            return new VisibilityMap([Rev.CXX98, Rev.CXX11, Rev.CXX14]);
+        for (; i < classes_cxx.length; i++) {
+            if (el.hasClass(classes_cxx[i].until)) {
+                break;
+            }
+            map.add(classes_cxx[i].rev);
         }
-        return new VisibilityMap([Rev.CXX98, Rev.CXX11, Rev.CXX14, Rev.CXX17]);
+        return map;
     }
 
     function get_visibility_map_c(el) {
@@ -1150,7 +1162,7 @@ $(function() {
             // process the member dcls
             el.children('.t-dcl').each(function() {
                 var new_id = process_tr($(this), has_num, has_revs,
-                                        new_def.revs.slice());
+                                        new_def.revs.clone());
                 new_def.children.push(new_id);
             });