Skip to content

Indent: Improve support for randcase #246

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 13, 2024
Merged

Indent: Improve support for randcase #246

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ftplugin/verilog_systemverilog.vim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ if exists("loaded_matchit")
let b:match_ignorecase=0
let b:match_words=
\ '\<begin\>:\<end\>,' .
\ '\<case\>\|\<casex\>\|\<casez\>:\<endcase\>,' .
\ '\<case\>\|\<casex\>\|\<casez\>\|\<randcase\>:\<endcase\>,' .
\ '`if\(n\)\?def\>:`elsif\>:`else\>:`endif\>,' .
\ '\<module\>:\<endmodule\>,' .
\ '\<if\>:\<else\>,' .
Expand Down
5 changes: 1 addition & 4 deletions indent/verilog_systemverilog.vim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,6 @@ let s:vlog_sens_list = '\(@\s*(.*)\)'
let s:vlog_always = '\<always\(_ff\|_comb\|_latch\)\?\>\s*' . s:vlog_sens_list . '\?'
let s:vlog_method = '^\(\s*pure\s\+virtual\|\s*extern\)\@!.*\<\(function\|task\)\>\s\+\(\[.*\]\s*\)\?\w\+'

let s:vlog_block_start = '\<\(begin\|case\|^\s*fork\)\>\|{\|('
let s:vlog_block_end = '\<\(end\|endcase\|join\(_all\|_none\)\?\)\>\|}\|)'

let s:vlog_module = '\<\(extern\s\+\)\@<!module\>'
let s:vlog_interface = '\(virtual\s\+\)\@<!\<interface\>\s*\(\<class\>\)\@!\w\+.*[^,]$'
let s:vlog_package = '\<package\>'
Expand All @@ -48,7 +45,7 @@ let s:vlog_clocking = g:verilog_syntax['clocking'][0]['match_start']
let s:vlog_preproc = '^\s*`ifn\?def\>'
let s:vlog_define = '^\s*`define\>'

let s:vlog_case = '\<case[zx]\?\>\s*('
let s:vlog_case = '\<case[zx]\?\>\s*(\|\<randcase\>'
let s:vlog_join = '\<join\(_any\|_none\)\?\>'

let s:vlog_block_decl = '\(\<\(while\|if\|foreach\|for\|repeat\)\>\s*(\)\|\<\(initial\|forever\|else\|do\)\>\|' . s:vlog_always
Expand Down
6 changes: 6 additions & 0 deletions test/indent.sv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -526,6 +526,12 @@ case (Signal)
endcase
// End of copied code

randcase
1: value <= 0;
2: value <= 1;
3: value <= 2;
endcase

interface class base;

pure virtual function void a(input int unsigned N, ref t Data);
Expand Down
6 changes: 6 additions & 0 deletions test/indent.sv.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -528,6 +528,12 @@
<span class="Statement">endcase</span>
<span class="Comment">// End of copied code</span>

<span class="Statement">randcase</span>
<span class="Constant">1</span><span class="Special">:</span> value <span class="Special">&lt;=</span> <span class="Constant">0</span><span class="Special">;</span>
<span class="Constant">2</span><span class="Special">:</span> value <span class="Special">&lt;=</span> <span class="Constant">1</span><span class="Special">;</span>
<span class="Constant">3</span><span class="Special">:</span> value <span class="Special">&lt;=</span> <span class="Constant">2</span><span class="Special">;</span>
<span class="Statement">endcase</span>

<span class="Statement">interface</span> <span class="Statement">class</span> base<span class="Special">;</span>

<span class="Statement">pure</span> <span class="Statement">virtual</span> <span class="Statement">function</span> <span class="Statement">void</span> <span class="Identifier">a</span><span class="Special">(</span><span class="Statement">input</span> <span class="Statement">int</span> <span class="Statement">unsigned</span> <span class="Constant">N</span><span class="Special">,</span> <span class="Statement">ref</span> t Data<span class="Special">);</span>
Expand Down
6 changes: 6 additions & 0 deletions test/indent_standalone.sv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -526,6 +526,12 @@ case (Signal)
endcase
// End of copied code

randcase
1: value <= 0;
2: value <= 1;
3: value <= 2;
endcase

interface class base;

pure virtual function void a(input int unsigned N, ref t Data);
Expand Down
Loading